Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0238974 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0238974 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0238974 Branch: refs/heads/cassandra-2.0 Commit: e02389747cf265e589c7487ad832f20163ac3ece Parents: fb9b3d5 33fda2d Author: Dave Brosius <[email protected]> Authored: Tue Aug 20 17:53:43 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Tue Aug 20 17:53:43 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 6 ++++-- src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- src/java/org/apache/cassandra/service/StorageServiceMBean.java | 4 ++-- src/java/org/apache/cassandra/tools/NodeCmd.java | 5 ++++- src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++-- 6 files changed, 17 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0238974/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0238974/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
