Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90b3acad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90b3acad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90b3acad
Branch: refs/heads/cassandra-2.1
Commit: 90b3acadccd25c8da307362bbb0dfa20714c2199
Parents: f7e3b9a c7b7a24
Author: Brandon Williams <[email protected]>
Authored: Wed Jul 23 15:05:05 2014 -0500
Committer: Brandon Williams <[email protected]>
Committed: Wed Jul 23 15:05:05 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90b3acad/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4432b10,caef095..adb4142
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,9 +1,25 @@@
+2.1.1
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * 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)
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
+ * Give read access to system.schema_usertypes to all authenticated users
+ (CASSANDRA-7578)
+ * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+
+ 2.1.0-final
+ * Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
2.1.0-rc4
+ * Fix word count hadoop example (CASSANDRA-7200)
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
(CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
