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 Wed, 12 Mar 2014 21:49:08 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/e8df012d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8df012d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8df012d

Branch: refs/heads/trunk
Commit: e8df012d8ffa9476e11c9a03a7ac9654b36e6c10
Parents: 94c96f3 773dda7
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Mar 12 16:49:01 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Mar 12 16:49:01 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 .../org/apache/cassandra/db/commitlog/CommitLogSegment.java     | 5 +++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8df012d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bc6d710,d346499..bceaf88
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.0
 + * Remove CQL2 (CASSANDRA-5918)
 + * add Thrift get_multi_slice call (CASSANDRA-6757)
 +
 +
  2.1.0-beta2
+  * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
   * Switch CRC component to Adler and include it for compressed sstables 
     (CASSANDRA-4165)
   * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)


Mime
View raw message