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/ce6296be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce6296be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce6296be Branch: refs/heads/trunk Commit: ce6296bea0578116a9b2a78ec8f6b1b96f6cc700 Parents: 3ea35bd ffe48ec Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Nov 10 15:37:00 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Nov 10 15:37:00 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 2 + examples/triggers/README.txt | 41 ++++++---- examples/triggers/conf/AuditTrigger.properties | 19 +++++ examples/triggers/conf/InvertedIndex.properties | 19 ----- .../apache/cassandra/triggers/AuditTrigger.java | 71 ++++++++++++++++++ .../cassandra/triggers/InvertedIndex.java | 79 -------------------- 6 files changed, 120 insertions(+), 111 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce6296be/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8c41f50,e0c4e2b..e85022f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,12 @@@ +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: + * Updated trigger example (CASSANDRA-10257) Merged from 2.2: * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) Merged from 2.1: