Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 7bd7f390e37edb792d856d18c662314ccdca6c66 https://github.com/teiid/teiid/commit/7bd7f390e37edb792d856d18c662314ccdc... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-07-12 (Tue, 12 Jul 2016) Changed paths: M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java M engine/src/main/java/org/teiid/query/util/Options.java Log Message: ----------- TEIID-4330 adding an option to make source grouping less aggressive Commit: a83d9b26418c9a2c00ee36e8f4263da6ba22ea12 https://github.com/teiid/teiid/commit/a83d9b26418c9a2c00ee36e8f4263da6ba2... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2016-07-12 (Tue, 12 Jul 2016) Changed paths: M connectors/translator-swagger/src/main/java/org/teiid/translator/swagger/JsonSerializer.java M connectors/translator-swagger/src/main/java/org/teiid/translator/swagger/SwaggerMetadataProcessor.java M connectors/translator-swagger/src/main/java/org/teiid/translator/swagger/SwaggerPlugin.java M connectors/translator-swagger/src/main/resources/org/teiid/translator/swagger/i18n.properties Log Message: ----------- Merge branch 'master' of github.com:teiid/teiid Compare: https://github.com/teiid/teiid/compare/dafadca04179...a83d9b26418c