Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3acf269 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3acf269 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3acf269 Branch: refs/heads/cassandra-1.2 Commit: c3acf269f72b767a9eb6274f45868bb9d2aecb19 Parents: 354cb09 8c24d01 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Nov 21 17:06:26 2012 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Nov 21 17:06:26 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 24 ++++- .../cassandra/db/ColumnFamilyStoreMBean.java | 6 +- .../org/apache/cassandra/service/PBSPredictor.java | 10 +- .../cassandra/service/PBSPredictorMBean.java | 2 +- .../apache/cassandra/service/StorageService.java | 84 +++++++++++---- .../cassandra/service/StorageServiceMBean.java | 25 ++--- src/java/org/apache/cassandra/tools/NodeCmd.java | 6 +- src/java/org/apache/cassandra/tools/NodeProbe.java | 13 +-- 9 files changed, 104 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3acf269/CHANGES.txt ----------------------------------------------------------------------
