Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/334fbad7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/334fbad7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/334fbad7 Branch: refs/heads/trunk Commit: 334fbad7b07d84e9e38cb61d5a1287a981bea964 Parents: d8ad0f0 b3231e9 Author: Tyler Hobbs <[email protected]> Authored: Fri Nov 13 15:37:20 2015 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Fri Nov 13 15:37:20 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../cassandra/index/SecondaryIndexManager.java | 6 ++- .../validation/entities/SecondaryIndexTest.java | 55 ++++++++++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/334fbad7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6ee2beb,9708859..bf65c9b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,7 +1,13 @@@ +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.1 Merged from 3.0: + * Correctly preserve deletion info on updated rows when notifying indexers + of single-row deletions (CASSANDRA-10694) * Notify indexers of partition delete during cleanup (CASSANDRA-10685) * Keep the file open in trySkipCache (CASSANDRA-10669) * Updated trigger example (CASSANDRA-10257)
