Updated Branches: refs/heads/cassandra-1.1 55f936f1d -> 0906b7cc5 refs/heads/cassandra-1.2 945853076 -> a96a8d41e refs/heads/trunk 3d1b85817 -> e33025863
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3302586 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3302586 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3302586 Branch: refs/heads/trunk Commit: e330258636cad2314e84a99be8d91270cb23441a Parents: 3d1b858 a96a8d4 Author: Yuki Morishita <[email protected]> Authored: Tue Jan 8 14:28:56 2013 -0600 Committer: Yuki Morishita <[email protected]> Committed: Tue Jan 8 14:28:56 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 4 +- .../io/compress/CompressedRandomAccessReader.java | 74 +++------ .../cassandra/service/AntiEntropyService.java | 10 + .../apache/cassandra/service/StorageService.java | 137 ++++++++++----- .../cassandra/service/StorageServiceMBean.java | 16 ++- src/java/org/apache/cassandra/tools/NodeCmd.java | 28 ++-- src/java/org/apache/cassandra/tools/NodeProbe.java | 73 ++++++++ 7 files changed, 229 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3302586/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3302586/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
