Branch: refs/heads/62-8.7.x Home: https://github.com/teiid/teiid Commit: 846f1c68af257548bf3aa43b46e77480fb654417 https://github.com/teiid/teiid/commit/846f1c68af257548bf3aa43b46e77480fb6... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-04-16 (Thu, 16 Apr 2015) Changed paths: M engine/src/test/java/org/teiid/common/buffer/impl/TestBufferFrontedFileStoreCache.java Log Message: ----------- TEIID-3422 removing any memory allocation as well Commit: a47047a30bfeec5d87416f4796566873caaaf123 https://github.com/teiid/teiid/commit/a47047a30bfeec5d87416f4796566873caa... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-04-16 (Thu, 16 Apr 2015) Changed paths: M engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java Log Message: ----------- TEIID-3422 removing any memory allocation as well Commit: 6b4cf0c63419db63a78035c32b07b3c3c13e93e1 https://github.com/teiid/teiid/commit/6b4cf0c63419db63a78035c32b07b3c3c13... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-04-16 (Thu, 16 Apr 2015) Changed paths: M runtime/src/main/java/org/teiid/transport/SocketListener.java M runtime/src/test/java/org/teiid/transport/TestFailover.java Log Message: ----------- TEIID-3070 using a newer netty version Conflicts: pom.xml Compare: https://github.com/teiid/teiid/compare/401513e74921...6b4cf0c63419