Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/916e57b4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/916e57b4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/916e57b4 Branch: refs/heads/trunk Commit: 916e57b4a192b0a7abbf4041af8c51a2c4860099 Parents: 22ab026 ddaddf6 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Feb 19 16:15:25 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Feb 19 16:15:25 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
