cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Mon, 14 Dec 2015 09:38:24 GMT
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bfe6135
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bfe6135
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bfe6135

Branch: refs/heads/trunk
Commit: 9bfe613579d3febda4e0c448a012c0e78a4d277b
Parents: a808769 94e8d62
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Mon Dec 14 10:37:27 2015 +0100
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Mon Dec 14 10:37:39 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                            |  1 +
 .../cassandra/stress/generate/values/Generator.java    |  4 ++--
 .../apache/cassandra/stress/generate/values/Lists.java | 13 +++++++------
 .../apache/cassandra/stress/generate/values/Sets.java  | 10 +++++-----
 4 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bfe6135/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 10b6226,c30d35d..0ca5277
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,12 +1,24 @@@
 -3.0.2
 -Merged from 2.2
 +3.2
 + * 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 2.2:
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 - * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
  Merged from 2.1:
+  * Make Stress compiles within eclipse (CASSANDRA-10807)
   * Cassandra Daemon should print JVM arguments (CASSANDRA-10764)
   * Allow cancellation of index summary redistribution (CASSANDRA-8805)
  


Mime
View raw message