Merge remote-tracking branch 'refs/remotes/acunu/p/4122/02_remove_tokens' into HEAD
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a37bc9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a37bc9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a37bc9c Branch: refs/heads/vnodes Commit: 6a37bc9c2a8710695d2db5f033cfd8cc51dfd8d3 Parents: d5ad60e c0f3008 Author: Eric Evans <[email protected]> Authored: Sat Jul 14 12:37:21 2012 -0600 Committer: Eric Evans <[email protected]> Committed: Sat Jul 14 12:37:21 2012 -0600 ---------------------------------------------------------------------- .topdeps | 2 +- .topmsg | 9 ++++----- .../apache/cassandra/service/StorageService.java | 15 ++++++--------- 3 files changed, 11 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
