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/4139d8f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4139d8f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4139d8f3 Branch: refs/heads/trunk Commit: 4139d8f3fe88a1307458b59df3cf84f00ad97b2d Parents: 3f79c5b d55a51e Author: Robert Stupp <sn...@snazy.de> Authored: Fri Dec 11 16:44:28 2015 -0600 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Dec 11 16:44:28 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ conf/cassandra.yaml | 8 ++++++++ .../org/apache/cassandra/config/Config.java | 1 + .../cassandra/config/DatabaseDescriptor.java | 5 +++++ .../locator/ReconnectableSnitchHelper.java | 2 +- .../apache/cassandra/net/MessagingService.java | 20 ++++++++++++++++---- .../cassandra/service/StorageService.java | 8 ++++---- .../org/apache/cassandra/utils/FBUtilities.java | 16 ++++++++++++++++ .../apache/cassandra/service/RemoveTest.java | 2 +- 9 files changed, 54 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4139d8f3/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fad4bb2,a71ecbd..f06648e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,10 +1,21 @@@ -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: * Allow cancellation of index summary redistribution (CASSANDRA-8805) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4139d8f3/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4139d8f3/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4139d8f3/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4139d8f3/src/java/org/apache/cassandra/utils/FBUtilities.java ----------------------------------------------------------------------
