Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7ccd518 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7ccd518 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7ccd518 Branch: refs/heads/trunk Commit: b7ccd518c941eb95a8accd942c31950befea5c3e Parents: b93e96a bf97b85 Author: Yuki Morishita <yu...@apache.org> Authored: Mon Nov 28 16:22:32 2016 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Nov 28 16:22:32 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/tools/StandaloneUpgrader.java | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7ccd518/CHANGES.txt ----------------------------------------------------------------------