cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Tue, 12 Aug 2014 00:35:17 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/5d9621cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d9621cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d9621cd

Branch: refs/heads/trunk
Commit: 5d9621cd9d13efe7e9a4042097bbc6e5c8796165
Parents: 384f873 59806a8
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Aug 12 03:34:11 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Aug 12 03:34:11 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 src/java/org/apache/cassandra/db/Keyspace.java               | 4 +++-
 .../org/apache/cassandra/db/index/SecondaryIndexManager.java | 8 --------
 .../apache/cassandra/db/index/PerRowSecondaryIndexTest.java  | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f7dcbd7,a426df4..916d42b
--- 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
+  * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
   * Include stress yaml example in release and deb (CASSANDRA-7717)
   * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
   * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
----------------------------------------------------------------------


Mime
View raw message