Merge branch 'cassandra-2.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/f314c61f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f314c61f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f314c61f Branch: refs/heads/trunk Commit: f314c61f81af7be86c719a9851a49da272bd7963 Parents: 3aa7215 591a277 Author: Sylvain Lebresne <[email protected]> Authored: Mon Aug 25 10:10:54 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Aug 25 10:10:54 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 15 ++- .../cql3/statements/CreateTriggerStatement.java | 22 +++- .../cql3/statements/DropTriggerStatement.java | 22 ++-- .../org/apache/cassandra/cql3/CQLTester.java | 10 ++ .../cql3/CreateTriggerStatementTest.java | 115 +++++++++++++++++++ .../cassandra/triggers/TriggerExecutorTest.java | 2 +- 8 files changed, 177 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f314c61f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 711ca08,a5314df..2329333 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,5 +1,24 @@@ +3.0 + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) * (cqlsh) Display the current logged-in user (CASSANDRA-7785) * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE http://git-wip-us.apache.org/repos/asf/cassandra/blob/f314c61f/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f314c61f/src/java/org/apache/cassandra/cql3/Cql.g ----------------------------------------------------------------------
