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/468a4c58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/468a4c58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/468a4c58 Branch: refs/heads/trunk Commit: 468a4c58c7bd47b7e40ed5b085a95bcdfec1e522 Parents: 663cd43 0ad0de1 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Nov 3 09:35:11 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Nov 3 09:35:11 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 - .../db/SinglePartitionReadCommand.java | 22 -------------------- .../db/filter/ClusteringIndexNamesFilter.java | 14 ++----------- 3 files changed, 2 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/468a4c58/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c412bb3,1724f01..37f7aa4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,4 +1,10 @@@ +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 sstables by clustering in query by names path (10571) * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602) * Don't use 'names query' read path for counters (CASSANDRA-10572) * Fix backward compatibility for counters (CASSANDRA-10470) http://git-wip-us.apache.org/repos/asf/cassandra/blob/468a4c58/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/468a4c58/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java ----------------------------------------------------------------------
