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

Branch: refs/heads/cassandra-2.1
Commit: f302eb78445119372770e54dfd32837aa3c0912a
Parents: 8d06dd1 520de13
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Mon Aug 4 14:14:49 2014 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Mon Aug 4 14:14:49 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f302eb78/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 24d3d50,0927a30..e2cc92b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,20 @@@
 +2.1.1
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * 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:
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector 
(CASSANDRA-5345)
 + * cqlsh fails when version number parts are not int (CASSANDRA-7524)
 +
 +
  2.1.0-final
+ 
+ 2.1.0-rc5
   * Reject counters inside user types (CASSANDRA-7672)
   * Switch to notification-based GCInspector (CASSANDRA-7638)
   * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)

Reply via email to