cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mish...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 12 Jun 2014 18:11:46 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/1637498a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1637498a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1637498a

Branch: refs/heads/trunk
Commit: 1637498a5df7ce5f68471c9b2c0746ad8659d554
Parents: ac75774 68c9265
Author: Mikhail Stepura <mishail@apache.org>
Authored: Thu Jun 12 11:11:05 2014 -0700
Committer: Mikhail Stepura <mishail@apache.org>
Committed: Thu Jun 12 11:11:05 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../db/index/composites/CompositesSearcher.java |  3 +-
 .../cassandra/cql3/ContainsRelationTest.java    | 63 ++++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1637498a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 25dd9b5,680c2f8..82c2460
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,16 @@@
 +3.0
 + * 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-7208)
 + * Make incremental repair default (CASSANDRA-7250)
 +
 +
  2.1.0
+  * Fix exception when querying a composite-keyed table with a collection index
+    (CASSANDRA-7372)
   * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Explicitly use Long.MAX_VALUE timestamp for counter deletions
     (CASSANDRA-7346)


Mime
View raw message