cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Fri, 05 Jun 2015 12:43:22 GMT
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 255e5f14ca88b60ce8a45f60e73d8b38e10f8cf9
Parents: 0149e34 8c26550
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Fri Jun 5 05:41:55 2015 -0700
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Fri Jun 5 05:41:55 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 conf/cassandra.yaml                             |  2 +-
 .../cassandra/db/commitlog/CommitLog.java       | 26 +++++++-
 .../cassandra/db/commitlog/CommitLogMBean.java  | 18 ++++-
 .../db/commitlog/CommitLogSegment.java          | 16 ++++-
 .../db/commitlog/CommitLogSegmentManager.java   | 53 +++++++++------
 .../db/commitlog/CompressedSegment.java         | 12 ++++
 .../db/commitlog/MemoryMappedSegment.java       |  7 ++
 .../cassandra/metrics/CommitLogMetrics.java     |  2 +-
 .../db/commitlog/CommitLogStressTest.java       | 70 ++++++++++++++++----
 10 files changed, 167 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/255e5f14/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 783c4c4,04bbd84..560bd2b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +3.0:
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 +
 +
  2.2
+  * Compressed commit log should measure compressed space used (CASSANDRA-9095)
   * Fix comparison bug in CassandraRoleManager#collectRoles (CASSANDRA-9551)
   * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)
   * Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546)


Mime
View raw message