Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6c5d729 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6c5d729 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6c5d729 Branch: refs/heads/trunk Commit: f6c5d7298f7e68a317d997709cc8be16f048c66f Parents: 3fda52f 3a244d2 Author: Sam Tunnicliffe <[email protected]> Authored: Thu Mar 24 11:42:29 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Thu Mar 24 11:42:29 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../utils/RMIServerSocketFactoryImpl.java | 11 ++++++--- .../service/RMIServerSocketFactoryImplTest.java | 24 ++++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6c5d729/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7441abd,fe19df7..f86c91f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,8 +1,10 @@@ -3.0.5 +3.5 + * Fix clustering and row filters for LIKE queries on clustering columns (CASSANDRA-11397) +Merged from 3.0: + * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093) * Allocate merkletrees with the correct size (CASSANDRA-11390) * Support streaming pre-3.0 sstables (CASSANDRA-10990) - * Add backpressure to compressed commit log (CASSANDRA-10971) + * Add backpressure to compressed or encrypted commit log (CASSANDRA-10971) * SSTableExport supports secondary index tables (CASSANDRA-11330) * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
