Branch: refs/heads/master
Home: https://github.com/teiid/teiid
Commit: b420994d7a41f9196dbc814db5f84cf8a1c8da71
https://github.com/teiid/teiid/commit/b420994d7a41f9196dbc814db5f84cf8a1c...
Author: Van Halbert <vhalbert(a)redhat.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M build/assembly/adminshell-dist.xml
R build/assembly/client-jar.xml
M build/pom.xml
M pom.xml
Log Message:
-----------
TEIID-4094 refactoring teiid-jdbc.jar to be in its own project
Conflicts:
build/assembly/jboss-as7/dist.xml
build/pom.xml
Branch: refs/heads/63-8.12.x
Home: https://github.com/teiid/teiid
Commit: 8044ce58e8f99bf7f892f2b432eab9cf4bf29bb1
https://github.com/teiid/teiid/commit/8044ce58e8f99bf7f892f2b432eab9cf4bf...
Author: Van Halbert <vhalbert(a)redhat.com>
Date: 2016-03-21 (Mon, 21 Mar 2016)
Changed paths:
M build/assembly/adminshell/adminshell-dist.xml
R build/assembly/client-jar.xml
M build/assembly/jboss-as7/dist.xml
M build/pom.xml
M pom.xml
A teiid-jdbc/assembly/jdbc-jar.xml
A teiid-jdbc/dependency-reduced-pom.xml
A teiid-jdbc/pom.xml
Log Message:
-----------
TEIID-4094 refactoring teiid-jdbc.jar to be in its own project
Commit: 73438b9ef6319b47e0e9d60c01df42b5b8db36d9
https://github.com/teiid/teiid/commit/73438b9ef6319b47e0e9d60c01df42b5b8d...
Author: Steven Hawkins <shawkins(a)redhat.com>
Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths:
M build/assembly/adminshell/adminshell-dist.xml
R build/assembly/client-jar.xml
M build/assembly/jboss-as7/dist.xml
M build/pom.xml
M pom.xml
A teiid-jdbc/assembly/jdbc-jar.xml
A teiid-jdbc/dependency-reduced-pom.xml
A teiid-jdbc/pom.xml
Log Message:
-----------
Merge branch '63-8.12.x' of https://github.com/vhalbert/teiid into 63-8.12.x
Compare: https://github.com/teiid/teiid/compare/2e27d4e022a3...73438b9ef631