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 2014/07/15 22:15:30 UTC
[7/8] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a4cc22a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a4cc22a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a4cc22a
Branch: refs/heads/cassandra-2.1
Commit: 9a4cc22a3ebf54a52bcb7e361837ed9f51fbc58b
Parents: 0b7377f 3adf594
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 15 15:15:05 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 15 15:15:05 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
conf/cassandra.yaml | 23 +++++++++++++++-----
.../org/apache/cassandra/config/Config.java | 6 ++---
.../cassandra/config/DatabaseDescriptor.java | 6 +++++
4 files changed, 28 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4cc22a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fc6d4eb,b20c465..65763dc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,6 +1,17 @@@
+2.1.1
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Fail to start if commit log replay detects a problem (CASSANDRA-7125)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+
+
2.1.0-final
+ * Updated memtable_cleanup_threshold and memtable_flush_writers defaults
+ (CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
* Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
* Add missing table name to DROP INDEX responses and notifications (CASSANDRA-7539)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4cc22a/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4cc22a/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4cc22a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------