Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5dda0abb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5dda0abb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5dda0abb Branch: refs/heads/trunk Commit: 5dda0abbfd1e3346f08fd29386bc2462a6c559c1 Parents: 48d4f60 2ca8f38 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Aug 23 13:33:12 2016 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Aug 23 13:33:12 2016 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/MigrationManager.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dda0abb/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dda0abb/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dda0abb/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
