Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9fa54cf3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fa54cf3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9fa54cf3 Branch: refs/heads/trunk Commit: 9fa54cf3b3656c37decc18767ff198df5e243074 Parents: 55a7748 d280e97 Author: Aleksey Yeschenko <[email protected]> Authored: Sun Oct 27 23:35:17 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Sun Oct 27 23:35:17 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/ColumnFamily.java | 8 ++ .../apache/cassandra/db/ColumnFamilyStore.java | 20 +++- .../org/apache/cassandra/db/DataTracker.java | 9 ++ src/java/org/apache/cassandra/db/Memtable.java | 7 +- .../apache/cassandra/net/MessagingService.java | 20 +++- .../apache/cassandra/net/sink/IMessageSink.java | 42 -------- .../apache/cassandra/net/sink/SinkManager.java | 68 ------------- .../apache/cassandra/service/StorageProxy.java | 17 +++- .../org/apache/cassandra/sink/IMessageSink.java | 42 ++++++++ .../org/apache/cassandra/sink/IRequestSink.java | 32 ++++++ .../org/apache/cassandra/sink/SinkManager.java | 100 +++++++++++++++++++ .../cassandra/repair/DifferencerTest.java | 4 +- .../apache/cassandra/repair/ValidatorTest.java | 4 +- .../apache/cassandra/service/RemoveTest.java | 2 +- 15 files changed, 253 insertions(+), 124 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fa54cf3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fa54cf3/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fa54cf3/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fa54cf3/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fa54cf3/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
