Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/152da3cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/152da3cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/152da3cb Branch: refs/heads/trunk Commit: 152da3cb5eeacaf1b799a6e8443c2d821943bb9b Parents: 1612ad1 c198b76 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue Oct 8 20:43:25 2013 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Oct 8 20:43:25 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- .../apache/cassandra/service/StorageServiceServerTest.java | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/152da3cb/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/152da3cb/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
