cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Wed, 14 Oct 2015 18:38:51 GMT
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4a29764
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4a29764
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4a29764

Branch: refs/heads/trunk
Commit: d4a297640d16d537b22569d0732f80b031da3917
Parents: bcd921c 1415fa5
Author: Joshua McKenzie <jmckenzie@apache.org>
Authored: Wed Oct 14 14:38:11 2015 -0400
Committer: Joshua McKenzie <jmckenzie@apache.org>
Committed: Wed Oct 14 14:38:11 2015 -0400

----------------------------------------------------------------------
 CHANGES.txt              |   2 +
 NEWS.txt                 |   2 +-
 conf/cassandra-env.ps1   | 122 ++++++++++++++++++++++++--------------
 conf/cassandra-env.sh    | 134 ++++++++++++++++++++++++++++--------------
 conf/jvm.options         | 105 +++++++++++++++++++++++++++++++++
 debian/cassandra.install |   1 +
 debian/init              |   1 +
 7 files changed, 280 insertions(+), 87 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4a29764/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7a74ec8,66e34b6..a3a1740
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,6 +1,11 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0-rc2
+  * Revert CASSANDRA-7486, make CMS default GC, move GC config to
+    conf/jvm.options (CASSANDRA-10403)
   * Fix TeeingAppender causing some logs to be truncated/empty (CASSANDRA-10447)
   * Allow EACH_QUORUM for reads (CASSANDRA-9602)
   * Fix potential ClassCastException while upgrading (CASSANDRA-10468)


Mime
View raw message