Branch: refs/heads/8.11.x Home: https://github.com/teiid/teiid Commit: 2021873d0467132f9aca13c34b69f34c3f01953a https://github.com/teiid/teiid/commit/2021873d0467132f9aca13c34b69f34c3f0... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-08-26 (Wed, 26 Aug 2015) Changed paths: M engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java M engine/src/test/java/org/teiid/common/buffer/impl/TestBufferManagerImpl.java M runtime/src/main/java/org/teiid/services/BufferServiceImpl.java Log Message: ----------- TEIID-3635 fixing the buffer manager auto configuration Conflicts: engine/src/test/java/org/teiid/common/buffer/impl/TestBufferManagerImpl.java Commit: 3071d996883fffa0805e5ad8278f4cd3bbf0c11a https://github.com/teiid/teiid/commit/3071d996883fffa0805e5ad8278f4cd3bbf... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-08-26 (Wed, 26 Aug 2015) Changed paths: M engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java M runtime/src/main/java/org/teiid/services/BufferServiceImpl.java M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServerAdmin.java Log Message: ----------- TEIID-3635 tweaking the autoconfiguration based upon a variety of scenarios Compare: https://github.com/teiid/teiid/compare/aa5b19be7075...3071d996883f