cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.6' into cassandra-3.7
Date Tue, 10 May 2016 14:07:54 GMT
Merge branch 'cassandra-3.6' 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/3f902541
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f902541
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f902541

Branch: refs/heads/cassandra-3.7
Commit: 3f90254116ac95d19d8cbf1889a8567d6cc9d13c
Parents: a093e8c c17cbe1
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Tue May 10 15:00:18 2016 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Tue May 10 15:00:18 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 NEWS.txt                                        |  2 ++
 .../cassandra/service/CassandraDaemon.java      | 13 ++++++++++++
 .../apache/cassandra/service/StartupChecks.java | 21 ++++++++++++++++++--
 .../apache/cassandra/utils/JMXServerUtils.java  | 20 +++----------------
 5 files changed, 38 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f902541/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6e60bba,1690e09..faddf91
--- 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
+  * Allow server startup if JMX is configured directly (CASSANDRA-11725)
   * Prevent direct memory OOM on buffer pool allocations (CASSANDRA-11710)
   * Enhanced Compaction Logging (CASSANDRA-10805)
   * Make prepared statement cache size configurable (CASSANDRA-11555)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f902541/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------


Mime
View raw message