Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e6eb0e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e6eb0e7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e6eb0e7
Branch: refs/heads/trunk
Commit: 5e6eb0e723e2b95c90d54a79336f77b46053cf6b
Parents: f267308 94fea8d
Author: Aleksey Yeschenko <[email protected]>
Authored: Wed Oct 22 17:54:56 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Wed Oct 22 17:54:56 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e6eb0e7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bc0269f,5882080..0c302bb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,7 +1,39 @@@
+3.0
+ * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * 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.2
+ * Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
+
+
2.1.1
* Dont notify when replacing tmplink files (CASSANDRA-8157)
* Fix validation with multiple CONTAINS clause (CASSANDRA-8131)
