cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Tue, 12 Aug 2014 18:31:25 GMT
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/993f4f5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/993f4f5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/993f4f5e

Branch: refs/heads/cassandra-2.1
Commit: 993f4f5ed1db568d679a522aedfee2c7e763d52f
Parents: 712f54f 6795b6e
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Tue Aug 12 13:31:12 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Tue Aug 12 13:31:12 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/993f4f5e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e6335fc,de45aeb..7957eda
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 +2.1.1
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string representation of partition
 +   keys (CASSANDRA-7498)
 + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * 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:
 + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
 + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
 + * (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-rc6
+  * Add tracing entries about concurrent range requests (CASSANDRA-7599)
   * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
   * Remove netty buffer ref-counting (CASSANDRA-7735)
   * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/993f4f5e/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------


Mime
View raw message