Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ebb1f8d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ebb1f8d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ebb1f8d1 Branch: refs/heads/cassandra-3.1 Commit: ebb1f8d16a6e7504298dfabca84e4de7cf2f7cca Parents: 6405f6c 9784be5 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Thu Dec 3 11:56:20 2015 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Thu Dec 3 11:56:20 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/Schema.java | 41 +++++++++----------- .../apache/cassandra/db/ColumnFamilyStore.java | 4 +- src/java/org/apache/cassandra/db/Keyspace.java | 14 +++---- .../cassandra/service/StorageService.java | 19 +++------ 5 files changed, 32 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebb1f8d1/CHANGES.txt ----------------------------------------------------------------------
