Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af802014
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af802014
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af802014
Branch: refs/heads/cassandra-2.1
Commit: af802014d6e054b7bbb264b701f5a7f5545ec10d
Parents: 1b1f0b0 0490abf
Author: Marcus Eriksson <[email protected]>
Authored: Thu May 8 08:18:25 2014 +0200
Committer: Marcus Eriksson <[email protected]>
Committed: Thu May 8 08:18:25 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/AbstractCompactionStrategy.java | 16 +++++++++-------
.../apache/cassandra/service/CassandraDaemon.java | 3 ++-
3 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af802014/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f57b649,0acf740..714a475
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,26 +1,19 @@@
-2.0.9
- * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
- * Starting threads in OutboundTcpConnectionPool constructor causes race
conditions (CASSANDRA-7177)
- * return all cpu values from BackgroundActivityMonitor.readAndCompute
(CASSANDRA-7183)
- * fix c* launch issues on Russian os's due to output of linux 'free' cmd
(CASSANDRA-6162)
- * Fix disabling autocompaction (CASSANDRA-7187)
-
-2.0.8
+2.1.0-rc1
+ * Add snapshot "manifest" describing files included (CASSANDRA-6326)
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
+ * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
+ * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
+ * Upgrade NBHM lib (CASSANDRA-7128)
+ * Optimize netty server (CASSANDRA-6861)
+Merged from 2.0:
* Correctly delete scheduled range xfers (CASSANDRA-7143)
* Make batchlog replica selection rack-aware (CASSANDRA-6551)
- * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
- * Set JMX RMI port to 7199 (CASSANDRA-7087)
- * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
- * Log a warning for large batches (CASSANDRA-6487)
- * Queries on compact tables can return more rows that requested
(CASSANDRA-7052)
- * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
- * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
- * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
- * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
- * Plug holes in resource release when wiring up StreamSession
(CASSANDRA-7073)
- * Re-add parameter columns to tracing session (CASSANDRA-6942)
- * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
* Suggest CTRL-C or semicolon after three blank lines in cqlsh
(CASSANDRA-7142)
+ * return all cpu values from BackgroundActivityMonitor.readAndCompute
(CASSANDRA-7183)
+ * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
+ * fix c* launch issues on Russian os's due to output of linux 'free' cmd
(CASSANDRA-6162)
++ * Fix disabling autocompaction (CASSANDRA-7187)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af802014/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af802014/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
