Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e2df76e0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2df76e0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e2df76e0
Branch: refs/heads/trunk
Commit: e2df76e02454ff0b947b5ebc791f8f81c0696922
Parents: dfda97c f54cd98
Author: Tyler Hobbs <tylerho...@apache.org>
Authored: Wed Oct 15 12:13:23 2014 -0500
Committer: Tyler Hobbs <tylerho...@apache.org>
Committed: Wed Oct 15 12:13:23 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/db/filter/ExtendedFilter.java | 23 +++++++++++++++++-
.../CompositesIndexOnCollectionKey.java | 2 +-
.../cassandra/cql3/ContainsRelationTest.java | 25 ++++++++++++++++++++
4 files changed, 50 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2df76e0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4a669c2,4da1e56..8248d76
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,6 +1,36 @@@
+3.0
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup
(CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * 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)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740,
7781, 7929,
+ 7924, 7812, 8063)
+ * 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)
+ * improve concurrency of repair (CASSANDRA-6455)
+
+
2.1.1
+ * Fix exception when querying secondary index on set items or map keys
+ when some clustering columns are specified (CASSANDRA-8073)
* Send proper error response when there is an error during native
protocol message decode (CASSANDRA-8118)
* Gossip should ignore generation numbers too far in the future
(CASSANDRA-8113)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2df76e0/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java
----------------------------------------------------------------------
