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/a4e73877 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4e73877 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4e73877 Branch: refs/heads/trunk Commit: a4e7387772d5e57d737c8a780d552263ed51bd4a Parents: 5fae533 5ad1763 Author: Sam Tunnicliffe <[email protected]> Authored: Wed Jul 6 12:12:21 2016 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed Jul 6 12:12:21 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4e73877/CHANGES.txt ----------------------------------------------------------------------
