From 1d54fc339722400b05cc256b21a244c860b9a1bf Mon Sep 17 00:00:00 2001
From: Sam Tunnicliffe <sam@beobal.com>
Date: Wed, 15 Jul 2015 15:29:25 +0100
Subject: [PATCH] Don't include auth credentials in debug log

Patch by Sam Tunnicliffe; reviewed by Brandon Williams for
CASSANDRA-9682
---
 CHANGES.txt                                                     | 1 +
 .../apache/cassandra/transport/messages/CredentialsMessage.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 84d562ce46..a755cb98fe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.17
+ * Don't include auth credentials in debug log (CASSANDRA-9682)
  * Can't transition from write survey to normal mode (CASSANDRA-9740)
  * Avoid NPE in AuthSuccess#decode (CASSANDRA-9727)
  * Add listen_address to system.local (CASSANDRA-9603)
diff --git a/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java b/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
index 2c93afde47..815a8d38a7 100644
--- a/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
+++ b/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
@@ -89,6 +89,6 @@ public class CredentialsMessage extends Message.Request
     @Override
     public String toString()
     {
-        return "CREDENTIALS " + credentials;
+        return "CREDENTIALS";
     }
 }