cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 14 Mar 2014 17:40:23 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 79e3217f9bd52f45004d58843630fde796240cec
Parents: 8955a46 ace0e6e
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Mar 14 12:40:16 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Mar 14 12:40:16 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../db/commitlog/CommitLogSegmentManager.java   | 31 +++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79e3217f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e883275,24c8090..7a40ad4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,6 +1,11 @@@
 +3.0
 + * Remove CQL2 (CASSANDRA-5918)
 + * add Thrift get_multi_slice call (CASSANDRA-6757)
 +
 +
  2.1.0-beta2
+  * Eliminate possibility of CL segment appearing twice in active list 
+    (CASSANDRA-6557)
   * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
   * Switch CRC component to Adler and include it for compressed sstables 
     (CASSANDRA-4165)


Mime
View raw message