[teiid-commits] [teiid/teiid] 5a1a5f: TEIID-3635 fixing the buffer manager auto configur...

[shawkins]

  Branch: refs/heads/8.7.x
  Home:   https://github.com/teiid/teiid
  Commit: 5a1a5f721848f4f0448a702a6f0d479c88efc437
      https://github.com/teiid/teiid/commit/5a1a5f721848f4f0448a702a6f0d479c88efc437
  Author: shawkins <shawkins at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 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: f66b2b669082420f7e9f27cdd68b85cf3d0b1d0d
      https://github.com/teiid/teiid/commit/f66b2b669082420f7e9f27cdd68b85cf3d0b1d0d
  Author: shawkins <shawkins at redhat.com>
  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/BufferManagerImpl.java
    M runtime/src/main/java/org/teiid/services/BufferServiceImpl.java

  Log Message:
  -----------
  TEIID-3635: tweaking the autoconfiguration based upon a variety of
scenarios

Conflicts:
	runtime/src/test/java/org/teiid/runtime/TestEmbeddedServerAdmin.java


Compare: https://github.com/teiid/teiid/compare/5cd7c7db35ac...f66b2b669082