Merge branch '3.6-retag' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a093e8ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a093e8ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a093e8ca Branch: refs/heads/trunk Commit: a093e8caeec431bdc8ec31efa8b3c1aeb9067285 Parents: a8a3a73 31cab36 Author: T Jake Luciani <[email protected]> Authored: Mon May 9 13:50:24 2016 -0400 Committer: T Jake Luciani <[email protected]> Committed: Mon May 9 13:50:24 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/a093e8ca/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3cee7ae,b7715ba..6e60bba --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +3.7 +Merged from 3.0: + * Refactor Materialized View code (CASSANDRA-11475) + * Update Java Driver (CASSANDRA-11615) +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)
