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/ed0c91ee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed0c91ee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed0c91ee Branch: refs/heads/trunk Commit: ed0c91ee424f61d59874519d4bf84979d7e8bad4 Parents: 7ea5b40 2af0764 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Nov 27 11:38:14 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Nov 27 11:38:14 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed0c91ee/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed0c91ee/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
