[teiid-commits] [teiid/teiid] 87bac6: TEIID-4380 preventing more than a single expanded ...
Branch: refs/heads/master
Home: https://github.com/teiid/teiid
Commit: 87bac67544e0381a59d68273ee7e27ab4cf44d43
https://github.com/teiid/teiid/commit/87bac67544e0381a59d68273ee7e27ab4cf...
Author: shawkins <shawkins(a)redhat.com>
Date: 2016-08-12 (Fri, 12 Aug 2016)
Changed paths:
M olingo/src/main/java/org/teiid/olingo/ODataPlugin.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
Log Message:
-----------
TEIID-4380 preventing more than a single expanded child
Commit: 19465cbdc6bdab1df54d19c3e1d659c6a615e28b
https://github.com/teiid/teiid/commit/19465cbdc6bdab1df54d19c3e1d659c6a61...
Author: Steven Hawkins <shawkins(a)redhat.com>
Date: 2016-08-12 (Fri, 12 Aug 2016)
Changed paths:
M connectors/translator-swagger/kits/wildfly/modules/io/swagger/core/main/module.xml
M
connectors/translator-swagger/src/main/java/org/teiid/translator/swagger/SwaggerMetadataProcessor.java
M
connectors/translator-swagger/src/test/java/org/teiid/translator/swagger/TestSwaggerMetadataProcessor.java
M connectors/translator-swagger/src/test/resources/swagger.json
M jboss-integration/kits/wildfly/modules/org/jboss/teiid/main/module.xml
M olingo/src/main/java/org/teiid/olingo/service/ODataSchemaBuilder.java
M pom.xml
M rest-service/kits/wildfly/modules/io/swagger/core/main/module.xml
Log Message:
-----------
Merge branch 'master' of github.com:teiid/teiid
Compare: https://github.com/teiid/teiid/compare/1289b075cec8...19465cbdc6bd