Merge branch 'cassandra-2.0' into cassandra-2.1 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/dc79a865 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc79a865 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc79a865 Branch: refs/heads/cassandra-2.2 Commit: dc79a865316c25e386019a25ad83412fa82c29bb Parents: 07103dd 1d54fc3 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed Jul 15 16:25:54 2015 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Wed Jul 15 16:25:54 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/transport/messages/CredentialsMessage.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc79a865/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 1e21c8d,a755cb9..e950f3b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,6 +1,31 @@@ -2.0.17 +2.1.9 + * Complete CASSANDRA-8448 fix (CASSANDRA-9519) + * Handle corrupt files on startup (CASSANDRA-9686) + * Fix clientutil jar and tests (CASSANDRA-9760) + * (cqlsh) Allow the SSL protocol version to be specified through the + config file or environment variables (CASSANDRA-9544) +Merged from 2.0: + * Don't include auth credentials in debug log (CASSANDRA-9682) * Can't transition from write survey to normal mode (CASSANDRA-9740) + * Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591) + * Fix growing pending background compaction (CASSANDRA-9662) + + +2.1.8 + * (cqlsh) Fix bad check for CQL compatibility when DESCRIBE'ing + COMPACT STORAGE tables with no clustering columns + * Warn when an extra-large partition is compacted (CASSANDRA-9643) + * Eliminate strong self-reference chains in sstable ref tidiers (CASSANDRA-9656) + * Ensure StreamSession uses canonical sstable reader instances (CASSANDRA-9700) + * Ensure memtable book keeping is not corrupted in the event we shrink usage (CASSANDRA-9681) + * Update internal python driver for cqlsh (CASSANDRA-9064) + * Fix IndexOutOfBoundsException when inserting tuple with too many + elements using the string literal notation (CASSANDRA-9559) + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090) + * Fix incorrect result for IN queries where column not found (CASSANDRA-9540) + * Enable describe on indices (CASSANDRA-7814) + * ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637) +Merged from 2.0: * Avoid NPE in AuthSuccess#decode (CASSANDRA-9727) * Add listen_address to system.local (CASSANDRA-9603) * Bug fixes to resultset metadata construction (CASSANDRA-9636) http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc79a865/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java ----------------------------------------------------------------------