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/ffe48ec6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffe48ec6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffe48ec6 Branch: refs/heads/cassandra-3.1 Commit: ffe48ec6ee9d541055208eeea2e974c158e427b2 Parents: 84fe374 fb463c7 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Nov 10 15:36:17 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Nov 10 15:36:17 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/ffe48ec6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 03b8544,b8a65fd..e0c4e2b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,4 -1,5 +1,6 @@@ -3.0.1 +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: