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/14dbba9d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14dbba9d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14dbba9d Branch: refs/heads/trunk Commit: 14dbba9d1f21773ecc41263f2cfa5759817dcfb0 Parents: 44fa12e 1be0bbf Author: Sylvain Lebresne <[email protected]> Authored: Wed Aug 27 11:00:54 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Aug 27 11:00:54 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/Operation.java | 19 +- .../org/apache/cassandra/cql3/CQLTester.java | 53 ++++- .../apache/cassandra/cql3/CollectionsTest.java | 227 +++++++++++++++++++ .../cassandra/cql3/MultiColumnRelationTest.java | 4 +- .../apache/cassandra/cql3/TupleTypeTest.java | 2 +- .../apache/cassandra/cql3/UserTypesTest.java | 2 - 7 files changed, 286 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14dbba9d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 90c5d29,0f1adf0..4d94e93 --- 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 syntax to remove multiple elements from a map (CASSANDRA-6599) * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) * (cqlsh) Display the current logged-in user (CASSANDRA-7785) http://git-wip-us.apache.org/repos/asf/cassandra/blob/14dbba9d/test/unit/org/apache/cassandra/cql3/CQLTester.java ----------------------------------------------------------------------
