cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 07 Oct 2014 15:23:17 GMT
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/8a8d35e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a8d35e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a8d35e6

Branch: refs/heads/trunk
Commit: 8a8d35e6d8e48cbedd6ca0bf8f0b50fa286a978e
Parents: 0cad81a 8d20b48
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Tue Oct 7 10:23:05 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Tue Oct 7 10:23:05 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/db/filter/ExtendedFilter.java     | 15 +++++++++---
 .../cassandra/cql3/ContainsRelationTest.java    | 24 ++++++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a8d35e6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 132396e,6949209..47c3e74
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 +3.0
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Improve query to read paxos table on propose (CASSANDRA-7929)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Optimize java source-based UDF invocation (CASSANDRA-7924)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Support Java source code for user-defined functions (CASSANDRA-7562)
 + * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
 + * 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)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 +
 +
  2.1.1
+  * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
   * Properly track added size (CASSANDRA-7239)
   * Allow compilation in java 8 (CASSANDRA-7208)
   * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a8d35e6/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a8d35e6/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java
----------------------------------------------------------------------


Mime
View raw message