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/d4f63aa5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4f63aa5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4f63aa5 Branch: refs/heads/trunk Commit: d4f63aa578eec0412b7392cba208a0df5e62aa2d Parents: 825b23b a30dfbd Author: Jason Brown <jasobr...@apple.com> Authored: Fri May 30 05:52:57 2014 -0700 Committer: Jason Brown <jasobr...@apple.com> Committed: Fri May 30 05:52:57 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4f63aa5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4f63aa5/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
