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/2629c30a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2629c30a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2629c30a Branch: refs/heads/trunk Commit: 2629c30a926c6d2f7ec935f4ea39a715872a894f Parents: 39342b9 4d9da02 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed May 7 01:40:57 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed May 7 01:40:57 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ src/java/org/apache/cassandra/service/StorageService.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2629c30a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2629c30a/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
