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/0ac8c664 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ac8c664 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ac8c664 Branch: refs/heads/trunk Commit: 0ac8c66400c6399e8dfed616a164818da1579652 Parents: 51b6667 01370bb Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Oct 23 23:46:14 2013 +0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Oct 23 23:46:14 2013 +0800 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../cassandra/service/AbstractReadExecutor.java | 9 +++--- .../cassandra/service/AbstractRowResolver.java | 20 +----------- .../cassandra/service/IResponseResolver.java | 2 +- .../service/RangeSliceResponseResolver.java | 3 +- .../apache/cassandra/service/ReadCallback.java | 11 ++----- .../cassandra/service/RowDigestResolver.java | 32 ++++++-------------- .../apache/cassandra/service/StorageProxy.java | 7 ++++- 8 files changed, 27 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ac8c664/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ac8c664/src/java/org/apache/cassandra/service/RowDigestResolver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ac8c664/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
