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/46539e19 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46539e19 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46539e19 Branch: refs/heads/trunk Commit: 46539e196cdd58eb0ff760e5e361e6b4ef956d71 Parents: ee64bf7 8939ac4 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri May 2 15:48:17 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri May 2 15:48:17 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 31 ++++++++++++++++++++ .../cassandra/service/StorageService.java | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46539e19/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46539e19/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
