Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/653d0bff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/653d0bff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/653d0bff Branch: refs/heads/trunk Commit: 653d0bffcf02e698ca727bb5c151dfea19202eb5 Parents: 640072b a093e8c Author: T Jake Luciani <[email protected]> Authored: Mon May 9 13:51:52 2016 -0400 Committer: T Jake Luciani <[email protected]> Committed: Mon May 9 13:51:52 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/Config.java | 2 +- .../cassandra/config/DatabaseDescriptor.java | 7 +++++++ .../apache/cassandra/utils/memory/BufferPool.java | 17 ++++++++++++++++- 4 files changed, 25 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/653d0bff/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d9f1688,6e60bba..731bfc8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -12,8 -6,8 +12,9 @@@ Merged from 2.2 * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395) * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) + 3.6 + * Prevent direct memory OOM on buffer pool allocations (CASSANDRA-11710) * Enhanced Compaction Logging (CASSANDRA-10805) * Make prepared statement cache size configurable (CASSANDRA-11555) * Integrated JMX authentication and authorization (CASSANDRA-10091) http://git-wip-us.apache.org/repos/asf/cassandra/blob/653d0bff/src/java/org/apache/cassandra/utils/memory/BufferPool.java ----------------------------------------------------------------------
