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/74c49b65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74c49b65 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74c49b65 Branch: refs/heads/trunk Commit: 74c49b65e362831c5e1382dd124df9bf855bd0cf Parents: c807b42 359de19 Author: Yuki Morishita <[email protected]> Authored: Mon May 12 12:37:08 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Mon May 12 12:37:08 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 46 ++++++-------------- 2 files changed, 14 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74c49b65/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74c49b65/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
