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/f7666d5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7666d5f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7666d5f Branch: refs/heads/trunk Commit: f7666d5f21807e783ab802a1a78262518d96cc0e Parents: 4139d8f c0d47be Author: Robert Stupp <[email protected]> Authored: Fri Dec 11 16:51:23 2015 -0600 Committer: Robert Stupp <[email protected]> Committed: Fri Dec 11 16:51:23 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7666d5f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f06648e,e20f5ed..905f7a3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,27 -1,15 +1,28 @@@ -3.0.2 -Merged from 2.2 +3.2 + * 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: + * Cassandra Daemon should print JVM arguments (CASSANDRA-10764) * Allow cancellation of index summary redistribution (CASSANDRA-8805) -3.0.1 + +3.1 +Merged from 3.0: * Avoid MV race during node decommission (CASSANDRA-10674) * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) * Handle single-column deletions correction in materialized views http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7666d5f/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
