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/82189ee3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82189ee3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82189ee3 Branch: refs/heads/trunk Commit: 82189ee3290c481da26f10b55ea73e4b47cc33a4 Parents: 81e1b15 8f98585 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Nov 4 14:05:48 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Nov 4 14:05:48 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82189ee3/CHANGES.txt ----------------------------------------------------------------------