Branch: refs/heads/63-8.12.x
Home:
https://github.com/teiid/teiid
Commit: 3e057a6f8395b17a02c8e85e0f049e2779c09127
https://github.com/teiid/teiid/commit/3e057a6f8395b17a02c8e85e0f049e2779c...
Author: shawkins <shawkins(a)redhat.com>
Date: 2016-02-25 (Thu, 25 Feb 2016)
Changed paths:
M engine/src/main/java/org/teiid/query/QueryPlugin.java
M engine/src/main/java/org/teiid/query/function/FunctionMethods.java
M engine/src/main/resources/org/teiid/query/i18n.properties
Log Message:
-----------
TEIID-3983 using the status property
Conflicts:
engine/src/main/java/org/teiid/query/QueryPlugin.java
engine/src/main/resources/org/teiid/query/i18n.properties
Conflicts:
engine/src/main/resources/org/teiid/query/i18n.properties
Commit: 6f7828fac0657351e673ba671ad71c13c9076e18
https://github.com/teiid/teiid/commit/6f7828fac0657351e673ba671ad71c13c90...
Author: Steven Hawkins <shawkins(a)redhat.com>
Date: 2016-02-25 (Thu, 25 Feb 2016)
Changed paths:
M connectors/connector-ws/kits/jboss-as7-dist.xml
M
connectors/connector-ws/kits/jboss-as7/modules/org/springframework/spring/main/module.xml
M connectors/connector-ws/pom.xml
M pom.xml
Log Message:
-----------
Merge branch '63-8.12.x' of github.com:teiid/teiid into 63-8.12.x
Compare:
https://github.com/teiid/teiid/compare/895109f2ee2e...6f7828fac065