You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/19 21:41:12 UTC
[3/3] git commit: merge from 2.0
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fee30d5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fee30d5a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fee30d5a
Branch: refs/heads/trunk
Commit: fee30d5ad654a90391f5871a7393330b34fa8ebb
Parents: e5a7ced 72be2a4
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 14:41:06 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 14:41:06 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 19 +++++++++++++++----
conf/cassandra.yaml | 4 ++--
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../cassandra/config/DatabaseDescriptor.java | 2 +-
5 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fee30d5a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 44c7f1b,979d6b0..2b5bf79
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
+2.1
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+
+
2.0.2
+ * Improve memory use defaults (CASSANDRA-5069)
* Make ThriftServer more easlly extensible (CASSANDRA-6058)
* Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
Merged from 1.2:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fee30d5a/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 9b0938d,3712073..8990769
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,15 -13,15 +13,26 @@@ restore snapshots created with the prev
'sstableloader' tool. You can upgrade the file format of your snapshots
using the provided 'sstableupgrade' tool.
+2.1
+===
+Upgrading
+---------
+ - Rolling upgrades from anything pre-2.0 is not supported.
- - 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.
++ - 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.
++
++
+ 2.0.2
+ =====
+
+ Upgrading
+ ---------
+ - The default memtable allocation has changed from 1/3 of heap to 1/4
+ of heap. Also, default (single-partition) read and write timeouts
+ have been reduced from 10s to 5s and 2s, respectively.
+
2.0.0
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fee30d5a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------