Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b05203f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b05203f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b05203f Branch: refs/heads/cassandra-3.3 Commit: 0b05203feaab296c6530469fdd128c24cc2c6a97 Parents: d2b7051 3b244a3 Author: Yuki Morishita <yu...@apache.org> Authored: Fri Jan 22 11:43:35 2016 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri Jan 22 11:43:35 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b05203f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b05203f/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
