cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [08/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 15 Jul 2015 15:29:25 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82e2004c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82e2004c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82e2004c

Branch: refs/heads/cassandra-2.2
Commit: 82e2004c27ffb0750db9205d9e718efd98218b1a
Parents: 6a40b81 dc79a86
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Wed Jul 15 16:26:44 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Wed Jul 15 16:26:44 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/82e2004c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c2d06e4,e950f3b..b4ea4b4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,8 -5,9 +8,9 @@@ Merged from 2.1
   * (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)
 + * Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591)
   * Fix growing pending background compaction (CASSANDRA-9662)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/82e2004c/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
----------------------------------------------------------------------


Mime
View raw message