Merge branch 'cassandra-3.1' into trunk
Conflicts:
NEWS.txt
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5037236
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5037236
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5037236
Branch: refs/heads/trunk
Commit: c50372367ec9c8d5e2ca1bcaa70aa464b389c72f
Parents: f4f79aa e092873
Author: T Jake Luciani <[email protected]>
Authored: Fri Dec 4 16:02:48 2015 -0500
Committer: T Jake Luciani <[email protected]>
Committed: Fri Dec 4 16:02:48 2015 -0500
----------------------------------------------------------------------
NEWS.txt | 2 +-
debian/changelog | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5037236/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index eef79c0,e296544..ec39f27
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,21 -13,7 +13,21 @@@ restore snapshots created with the prev
'sstableloader' tool. You can upgrade the file format of your snapshots
using the provided 'sstableupgrade' tool.
+3.2
+===
+
+New features
+------------
+ - bound maximum in-flight commit log replay mutation bytes to 64 megabytes
+ tunable via cassandra.commitlog_max_outstanding_replay_bytes
+ - Support for type casting has been added to the selection clause.
+
+Upgrading
+---------
+ - The compression ratio metrics computation has been modified to be more
accurate.
+
+
- 3.0.1
+ 3.1
=====
Upgrading
