cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Tue, 22 Dec 2015 22:26:46 GMT
Merge branch 'cassandra-3.0' into trunk

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

Branch: refs/heads/trunk
Commit: e5b6a9c8b289982c78ff9266db28aa21b28f23ef
Parents: cae3950 796db6e
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Tue Dec 22 16:26:24 2015 -0600
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Tue Dec 22 16:26:24 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                 | 1 +
 .../apache/cassandra/cql3/statements/BatchStatement.java    | 3 +++
 test/unit/org/apache/cassandra/cql3/BatchTests.java         | 9 ++++++---
 3 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5b6a9c8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9f82731,7794c96..e36e4c2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,5 +1,29 @@@
 -3.0.3
 +3.2
 + * Add forceUserDefinedCleanup to allow more flexible cleanup (CASSANDRA-10708)
 + * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
 + * Fix EstimatedHistogram creation in nodetool tablehistograms (CASSANDRA-10859)
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created (CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +Merged from 3.0:
+  * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
   * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
   * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
   * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5b6a9c8/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------


Mime
View raw message