[teiid-commits] [teiid/teiid] de0f8c: TEIID-4480 correcting the merge

[shawkins]

  Branch: refs/heads/9.0.x
  Home:   https://github.com/teiid/teiid
  Commit: de0f8cabaab524243f627fdb35516e89bced5ef5
      https://github.com/teiid/teiid/commit/de0f8cabaab524243f627fdb35516e89bced5ef5
  Author: shawkins <shawkins at redhat.com>
  Date:   2016-10-26 (Wed, 26 Oct 2016)

  Changed paths:
    M jboss-integration/kits/wildfly/standalone/configuration/standalone-teiid.xml

  Log Message:
  -----------
  TEIID-4480 correcting the merge