Branch: refs/heads/62-8.7.x
Home: https://github.com/teiid/teiid
Commit: 09dbd875bc4dd11930fb16ec013e9d31bbc50c28
https://github.com/teiid/teiid/commit/09dbd875bc4dd11930fb16ec013e9d31bbc...
Author: Ramesh Reddy <rareddy(a)jboss.org>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
Log Message:
-----------
TEIID-3556: during the close operation the command context is not set on the calling thread, thus missing the required updates to the command context, thus decrementing the reserved memory field twice leading to negitive number
Commit: ee8f2ac208468e68189935ad3d6a0828ae9d2938
https://github.com/teiid/teiid/commit/ee8f2ac208468e68189935ad3d6a0828ae9...
Author: Ramesh Reddy <rareddy(a)jboss.org>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
Log Message:
-----------
Merge pull request #483 from rareddy/TEIID-3556
TEIID-3556: during the close operation the command context is not set…
Compare: https://github.com/teiid/teiid/compare/b7bcb166ed15...ee8f2ac20846
Branch: refs/heads/master
Home: https://github.com/teiid/teiid
Commit: 6995f2099b5de74f95262f512d24f89bb6c418ef
https://github.com/teiid/teiid/commit/6995f2099b5de74f95262f512d24f89bb6c...
Author: shawkins <shawkins(a)redhat.com>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M odata/src/main/java/org/teiid/odata/LocalClient.java
M odata/src/main/java/org/teiid/odata/ODataPlugin.java
M odata/src/main/java/org/teiid/odata/TeiidProducer.java
M odata/src/main/resources/org/teiid/odata/i18n.properties
M odata/src/test/java/org/teiid/odata/TestODataIntegration.java
M olingo/pom.xml
Log Message:
-----------
TEIID-3553 adding exceptions on ambiguity
Branch: refs/heads/62-8.7.x
Home: https://github.com/teiid/teiid
Commit: b7bcb166ed1534efb6c85f026a81a61d1b239ea5
https://github.com/teiid/teiid/commit/b7bcb166ed1534efb6c85f026a81a61d1b2...
Author: shawkins <shawkins(a)redhat.com>
Date: 2015-06-23 (Tue, 23 Jun 2015)
Changed paths:
M odata/src/test/java/org/teiid/odata/TestODataIntegration.java
Log Message:
-----------
TEIID-3410 adding a test to look for the fully qualified name
Conflicts:
pom.xml