Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfd0104d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfd0104d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfd0104d Branch: refs/heads/trunk Commit: bfd0104dc5e4b50276bb67ce1b6740292c47de70 Parents: 29589f9 82e2004 Author: Sam Tunnicliffe <[email protected]> Authored: Wed Jul 15 16:27:09 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed Jul 15 16:27:09 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/bfd0104d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0c71f52,b4ea4b4..5104bab --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -25,8 -6,9 +25,9 @@@ Merged from 2.1 * 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) + 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)
