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/8c1e4e08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c1e4e08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c1e4e08 Branch: refs/heads/trunk Commit: 8c1e4e0897ebcb04ec4277fcdc0f8b0cd74bc1fd Parents: 9371892 8462637 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Mar 6 15:25:43 2014 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Mar 6 15:25:43 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/StorageService.java | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c1e4e08/CHANGES.txt ----------------------------------------------------------------------
