Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf97b850 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf97b850 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf97b850 Branch: refs/heads/trunk Commit: bf97b8507618145a9da7fb088e1ae4463c047f5a Parents: f60ab23 2b65b0d Author: Yuki Morishita <yu...@apache.org> Authored: Mon Nov 28 16:21:12 2016 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Nov 28 16:21:12 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/bf97b850/CHANGES.txt ----------------------------------------------------------------------
