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/a7e6e0f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7e6e0f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7e6e0f5 Branch: refs/heads/trunk Commit: a7e6e0f55c1cf6f2a5668cdf00e08b8e963e9269 Parents: ff5ed7a 5abab57 Author: Yuki Morishita <yu...@apache.org> Authored: Mon Mar 30 17:02:16 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Mar 30 17:02:16 2015 -0500 ---------------------------------------------------------------------- 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/a7e6e0f5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7e6e0f5/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
