Branch: refs/heads/8.7.x Home: https://github.com/teiid/teiid Commit: 29698bd301184f53f1284677947195627c7d5811 https://github.com/teiid/teiid/commit/29698bd301184f53f1284677947195627c7... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-09-17 (Thu, 17 Sep 2015) Changed paths: M build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html M engine/src/main/java/org/teiid/common/buffer/impl/BlockByteBuffer.java M engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java M engine/src/test/java/org/teiid/common/buffer/impl/TestBlockByteBuffer.java Log Message: ----------- TEIID-3640: fixing initialization Conflicts: engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java