Merge remote-tracking branch 'refs/remotes/acunu/p/4127/01_migration_path' into HEAD
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61eeb952 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61eeb952 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61eeb952 Branch: refs/heads/vnodes Commit: 61eeb952a66436eb9f3be6e32c31b702ef2eeb23 Parents: 9379ea8 d9424c6 Author: Eric Evans <[email protected]> Authored: Sat Jul 14 12:37:22 2012 -0600 Committer: Eric Evans <[email protected]> Committed: Sat Jul 14 12:37:22 2012 -0600 ---------------------------------------------------------------------- .topdeps | 2 +- .topmsg | 4 +- .../apache/cassandra/service/StorageService.java | 53 ++++++++++++++- 3 files changed, 55 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
