Merge branch 'cassandra-2.1' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Conflicts:
CHANGES.txt
NEWS.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3632811f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3632811f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3632811f
Branch: refs/heads/trunk
Commit: 3632811fac3222c7e14a625755385fb12f087c5c
Parents: 8e172c8 a79d54e
Author: Sylvain Lebresne <[email protected]>
Authored: Mon Mar 31 12:34:24 2014 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Mon Mar 31 12:34:24 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 3 +
NEWS.txt | 8 +-
.../org/apache/cassandra/config/CFMetaData.java | 3 +-
.../apache/cassandra/db/BatchlogManager.java | 48 +++----
.../org/apache/cassandra/db/CounterCell.java | 17 ++-
.../cassandra/db/context/CounterContext.java | 138 ++++++++++++-------
.../apache/cassandra/net/MessagingService.java | 6 +-
.../apache/cassandra/service/StorageProxy.java | 51 ++++---
.../cassandra/db/BatchlogManagerTest.java | 7 +-
9 files changed, 165 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3632811f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c224c8f,0457b5e..9e104e0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -34,7 -34,9 +34,10 @@@
* Add multiple memory allocation options for memtables (CASSANDRA-6689)
* Remove adjusted op rate from stress output (CASSANDRA-6921)
* Add optimized CF.hasColumns() implementations (CASSANDRA-6941)
+ * Serialize batchlog mutations with the version of the target node
+ (CASSANDRA-6931)
+ * Optimize CounterColumn#reconcile() (CASSANDRA-6953)
+ * Properly remove 1.2 sstable support in 2.1 (CASSANDRA-6869)
Merged from 2.0:
* Restrict Windows to parallel repairs (CASSANDRA-6907)
* (Hadoop) Allow manually specifying start/end tokens in CFIF
(CASSANDRA-6436)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3632811f/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 7cb7565,b53795e..9567ef3
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -33,11 -33,11 +33,11 @@@ New feature
Upgrading
---------
- - Rolling upgrades from anything pre-2.0.6 is not supported. Furthermore
- - Pre-2.0 sstables are not supported. This means that before upgrading
- a node a 2.1, this node must be started on 2.0 and
- - Rolling upgrade from anything pre-2.0.7 is not supported.
- - For leveled compaction users, 2.0 must be atleast started before
- upgrading to 2.1 due to the fact that the old JSON leveled
- manifest is migrated into the sstable metadata files on startup
- in 2.0 and this code is gone from 2.1.
++ - Rolling upgrades from anything pre-2.0.7 is not supported. Furthermore
++ pre-2.0 sstables are not supported. This means that before upgrading
++ a node on 2.1, this node must be started on 2.0 and
+ 'nodetool upgdradesstables' must be run (and this even in the case
- of no-rolling upgrades).
++ of not-rolling upgrades).
- For size-tiered compaction users, Cassandra now defaults to ignoring
the coldest 5% of sstables. This can be customized with the
cold_reads_to_omit compaction option; 0.0 omits nothing (the old
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3632811f/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
