cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [19/19] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 22 Apr 2014 12:34:55 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/498eb2ab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/498eb2ab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/498eb2ab

Branch: refs/heads/trunk
Commit: 498eb2ab77d748b5b638b82450edd968fe5ca73a
Parents: 68aa62b a2e7435
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Apr 22 07:27:42 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Apr 22 07:27:42 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  4 +-
 .../org/apache/cassandra/db/ColumnFamily.java   |  5 ++
 .../org/apache/cassandra/db/DeletionInfo.java   | 34 +++++++++-
 .../org/apache/cassandra/db/DeletionTime.java   |  7 +-
 src/java/org/apache/cassandra/db/Keyspace.java  |  2 +-
 .../apache/cassandra/db/RangeTombstoneList.java | 68 ++++++++++++++++++--
 .../apache/cassandra/net/MessagingService.java  | 32 ++++++++-
 test/unit/org/apache/cassandra/Util.java        |  7 ++
 .../apache/cassandra/db/ColumnFamilyTest.java   | 46 ++++++++++++-
 test/unit/org/apache/cassandra/db/RowTest.java  | 40 ++++++++++--
 10 files changed, 228 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/498eb2ab/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d889278,495dab2..742f7de
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +3.0
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 +
 +
  2.1.0-beta2
+  * Add range tombstones to read repair digests (CASSANDRA-6863)
   * Fix BTree.clear for large updates (CASSANDRA-6943)
   * Fail write instead of logging a warning when unable to append to CL
     (CASSANDRA-6764)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/498eb2ab/src/java/org/apache/cassandra/db/ColumnFamily.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/498eb2ab/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------


Mime
View raw message