Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d09c369f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d09c369f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d09c369f Branch: refs/heads/vnodes Commit: d09c369f015aa33529138f160618060e1e6cf5a3 Parents: fc14072 8821e8b Author: Eric Evans <[email protected]> Authored: Tue Jul 17 22:18:25 2012 -0500 Committer: Eric Evans <[email protected]> Committed: Tue Jul 17 22:18:25 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 4 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 18 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
