Updated Branches: refs/heads/cassandra-1.1 1176d9f3a -> ba637b4d1 refs/heads/trunk 9b9aaaa8a -> 256e7c261
Merge branch 'cassandra-1.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/256e7c26 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/256e7c26 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/256e7c26 Branch: refs/heads/trunk Commit: 256e7c26100e5f94df4e3306f6b4dbb1a8086734 Parents: 9b9aaaa ba637b4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Feb 8 17:53:57 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Feb 8 17:53:57 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 17 ++--- .../apache/cassandra/service/StorageService.java | 52 +++++++------- .../cassandra/service/StorageServiceMBean.java | 9 +++ src/java/org/apache/cassandra/tools/NodeCmd.java | 16 +++++ src/java/org/apache/cassandra/tools/NodeProbe.java | 6 ++ 6 files changed, 66 insertions(+), 35 deletions(-) ----------------------------------------------------------------------
