[teiid-commits] [teiid/teiid] 135058: Merge branch 'teiidtools-300' of https://github.co...

[shawkins]

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: 135058f38d09c9774b1e4520fec94ad2ff083b01
      https://github.com/teiid/teiid/commit/135058f38d09c9774b1e4520fec94ad2ff083b01
  Author: shawkins <shawkins at redhat.com>
  Date:   2018-02-13 (Tue, 13 Feb 2018)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch 'teiidtools-300' of https://github.com/vhalbert/teiid

# Conflicts:
#	pom.xml