[teiid-commits] [teiid/teiid] aaac1c: TEIID-4058 fixing error code

[Steven Hawkins]

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: aaac1c21d160144513783fc0f3c21ef6ff37db33
      https://github.com/teiid/teiid/commit/aaac1c21d160144513783fc0f3c21ef6ff37db33
  Author: shawkins <shawkins at redhat.com>
  Date:   2016-03-11 (Fri, 11 Mar 2016)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/service/TeiidServiceHandler.java
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java

  Log Message:
  -----------
  TEIID-4058 fixing error code
Conflicts:
	olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java


  Commit: f438561111330e004eb6f27def8ef330007c3b5e
      https://github.com/teiid/teiid/commit/f438561111330e004eb6f27def8ef330007c3b5e
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2016-03-11 (Fri, 11 Mar 2016)

  Changed paths:
    M jboss-admin/src/main/java/org/teiid/adminapi/jboss/VDBMetadataMapper.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:teiid/teiid


Compare: https://github.com/teiid/teiid/compare/96907c3de9b6...f43856111133