Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b76ef07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b76ef07 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b76ef07 Branch: refs/heads/trunk Commit: 0b76ef07da8a1b79f69820efc2482a0ca9a4d78e Parents: 1fce648 0a35341 Author: T Jake Luciani <j...@apache.org> Authored: Mon Feb 29 10:32:44 2016 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Mon Feb 29 10:32:44 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b76ef07/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b76ef07/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
