[teiid-commits] [teiid/teiid] 0caad9: TEIID-3011 adding a better check as to when to ski...

[shawkins]

  Branch: refs/heads/8.7.x
  Home:   https://github.com/teiid/teiid
  Commit: 0caad9d61fb2c8c3398f7a4afc7809c44a5d28ed
      https://github.com/teiid/teiid/commit/0caad9d61fb2c8c3398f7a4afc7809c44a5d28ed
  Author: shawkins <shawkins at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    M engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java

  Log Message:
  -----------
  TEIID-3011 adding a better check as to when to skip rewrite


  Commit: 23cfd7ee0832e571836a3cb57c908d9cc1d0df26
      https://github.com/teiid/teiid/commit/23cfd7ee0832e571836a3cb57c908d9cc1d0df26
  Author: shawkins <shawkins at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M odata/src/main/webapp/META-INF/MANIFEST.MF

  Log Message:
  -----------
  TEIID-3010 adding joda dependency
Conflicts:

	test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData.java


Compare: https://github.com/teiid/teiid/compare/56f459227b3e...23cfd7ee0832