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/41f3cad4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41f3cad4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41f3cad4 Branch: refs/heads/trunk Commit: 41f3cad489d7329fb6a4b8f4edd5aa4392327504 Parents: 442d4c9 7b430ee Author: Benjamin Lerer <b.le...@gmail.com> Authored: Fri Nov 27 11:17:22 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Fri Nov 27 11:17:35 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ReadCommand.java | 9 +- .../index/IndexNotAvailableException.java | 34 ++++++++ .../cassandra/index/SecondaryIndexManager.java | 64 +++++++++++--- .../index/internal/CassandraIndex.java | 6 +- .../cassandra/net/MessageDeliveryTask.java | 7 +- .../validation/entities/SecondaryIndexTest.java | 88 ++++++++++++++++---- .../index/internal/CustomCassandraIndex.java | 4 +- 8 files changed, 178 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/41f3cad4/CHANGES.txt ----------------------------------------------------------------------
