cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/7] git commit: merge from 2.0
Date Wed, 23 Jul 2014 19:56:08 GMT
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/b181261c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b181261c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b181261c

Branch: refs/heads/trunk
Commit: b181261cfe2c975981c7a29a6b8c7ab4f5a7629f
Parents: 5dfee58 51a1f23
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Jul 18 18:14:47 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Jul 18 18:14:47 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 .../apache/cassandra/service/GCInspector.java   | 130 +++++++++++--------
 2 files changed, 80 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b181261c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index eb2a1a0,d4b11d1..a30de32
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,28 @@@
 -2.0.10
 +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)
 + * 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)
++Merged from 2.0:
+  * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
 +
 +
 +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)
 + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
 + * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
 + * Support conditional updates, tuple type, and the v3 protocol in cqlsh (CASSANDRA-7509)
 + * Handle queries on multiple secondary index types (CASSANDRA-7525)
 + * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 +Merged from 2.0:
   * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
   * Fix range merging when DES scores are zero (CASSANDRA-7535)
   * Warn when SSL certificates have expired (CASSANDRA-7528)


Mime
View raw message