cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 11 Jun 2014 22:43:38 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/utils/CounterIdTest.java


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

Branch: refs/heads/trunk
Commit: 5a9b1b4c1b2b5f97195f20bf8b4c917c54552f21
Parents: 9aace48 99594cd
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Jun 11 17:43:29 2014 -0500
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Jun 11 17:43:29 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/config/CFMetaData.java |  6 ---
 .../org/apache/cassandra/config/KSMetaData.java |  1 -
 .../org/apache/cassandra/db/SystemKeyspace.java | 48 +-------------------
 .../cassandra/service/StorageService.java       | 17 +++----
 .../org/apache/cassandra/utils/CounterId.java   | 38 +---------------
 .../apache/cassandra/utils/CounterIdTest.java   | 48 --------------------
 7 files changed, 9 insertions(+), 150 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a9b1b4c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index aa2f96c,9dd54f9..598c793
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +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)
 + * Make incremental repair default (CASSANDRA-7250)
 +
 +
  2.1.0
+  * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Explicitly use Long.MAX_VALUE timestamp for counter deletions
     (CASSANDRA-7346)
   * Fix native protocol CAS batches (CASSANDRA-7337)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a9b1b4c/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a9b1b4c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message