Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 3006b7f72cfe4a8b196b010428c424cf0680bd76 https://github.com/teiid/teiid/commit/3006b7f72cfe4a8b196b010428c424cf068... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-03-21 (Mon, 21 Mar 2016) Changed paths: M engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java M engine/src/test/java/org/teiid/query/parser/TestOptionsAndHints.java Log Message: ----------- TEIID-4016 allowing for any leading comment to be the cache hint Commit: 55694c0011b5e46cb1b93da52c2d80cb4e945bae https://github.com/teiid/teiid/commit/55694c0011b5e46cb1b93da52c2d80cb4e9... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2016-03-21 (Mon, 21 Mar 2016) Changed paths: M olingo/src/main/java/org/teiid/odata/api/Client.java M olingo/src/main/java/org/teiid/odata/api/QueryResponse.java M olingo/src/main/java/org/teiid/olingo/service/CrossJoinResult.java M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java M olingo/src/main/java/org/teiid/olingo/service/EntityCollectionResponse.java M olingo/src/main/java/org/teiid/olingo/service/ExpandDocumentNode.java M olingo/src/main/java/org/teiid/olingo/service/LocalClient.java M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java M olingo/src/main/java/org/teiid/olingo/service/OperationResponseImpl.java M olingo/src/main/java/org/teiid/olingo/service/TeiidServiceHandler.java M olingo/src/main/resources/org/teiid/olingo/i18n.properties M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java M olingo/src/test/java/org/teiid/olingo/TestODataSQLBuilder.java Log Message: ----------- Merge branch 'master' of github.com:teiid/teiid Compare: https://github.com/teiid/teiid/compare/a93daa517ccf...55694c0011b5