You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/07/24 19:40:24 UTC

[4/4] 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/51dfe782
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51dfe782
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51dfe782

Branch: refs/heads/cassandra-2.1
Commit: 51dfe78218f33a137eb858b43e9a8462d650c42f
Parents: 7f571b5 33719e7
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jul 24 20:38:50 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jul 24 20:39:58 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51dfe782/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index adb4142,3776319..d9f82f2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,4 +1,17 @@@
 +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)
++
++
+ 2.1.0-final
   * Fix native protocol drop user type notification (CASSANDRA-7571)
   * Give read access to system.schema_usertypes to all authenticated users
     (CASSANDRA-7578)