Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00fdaf22 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00fdaf22 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00fdaf22 Branch: refs/heads/trunk Commit: 00fdaf22b019fbef62999a8b575d663b01b3498c Parents: f1f52e7 d915834 Author: Sam Tunnicliffe <[email protected]> Authored: Wed Feb 3 12:08:50 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed Feb 3 12:08:50 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/Schema.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/00fdaf22/CHANGES.txt ----------------------------------------------------------------------
