Merge branch 'cassandra-3.1' into CASSANDRA-10796-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e372411 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e372411 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e372411 Branch: refs/heads/CASSANDRA-10796-3.1 Commit: 5e372411419cd7132c172cb21639be46c599736c Parents: 9d1f8d1 b815c78 Author: Tyler Hobbs <[email protected]> Authored: Thu Dec 3 10:37:49 2015 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Thu Dec 3 10:37:49 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 + NEWS.txt | 3 + build.xml | 2 +- .../org/apache/cassandra/config/Schema.java | 41 ++++++------ .../apache/cassandra/db/ColumnFamilyStore.java | 4 +- src/java/org/apache/cassandra/db/Keyspace.java | 14 ++--- src/java/org/apache/cassandra/index/Index.java | 20 +++--- .../cassandra/index/SecondaryIndexManager.java | 65 +++++++++----------- .../index/internal/CassandraIndex.java | 26 +++++--- .../cassandra/service/StorageService.java | 19 ++---- .../cassandra/streaming/StreamReader.java | 4 +- .../compress/CompressedStreamReader.java | 4 +- .../org/apache/cassandra/index/StubIndex.java | 6 +- .../index/internal/CustomCassandraIndex.java | 10 ++- 14 files changed, 98 insertions(+), 123 deletions(-) ----------------------------------------------------------------------
