Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9280273f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9280273f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9280273f Branch: refs/heads/trunk Commit: 9280273f729ac7ee277f1f82de7129ef576de9f8 Parents: 943294b 1e4d44e Author: Sylvain Lebresne <[email protected]> Authored: Fri Nov 6 11:54:37 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Nov 6 11:54:37 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/SinglePartitionReadCommand.java | 35 +++++++++++++++++++- .../db/filter/ClusteringIndexNamesFilter.java | 14 ++++++-- 3 files changed, 47 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9280273f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5352f22,bb8b4d2..8edb976 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * Skip sstable on clustering in names query (CASSANDRA-10571) * Remove value skipping as it breaks read-repair (CASSANDRA-10655) * Fix bootstrapping with MVs (CASSANDRA-10621) * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9280273f/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9280273f/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java ----------------------------------------------------------------------
