[teiid-commits] [teiid/teiid] 847e11: TEIID-2152 initial merge support