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