You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/07/15 17:29:18 UTC

[01/10] cassandra git commit: Don't include auth credentials in debug log

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 52dbc3f1b -> 1d54fc339
  refs/heads/cassandra-2.1 07103ddb7 -> dc79a8653
  refs/heads/cassandra-2.2 6a40b8128 -> 82e2004c2
  refs/heads/trunk 29589f935 -> bfd0104dc


Don't include auth credentials in debug log

Patch by Sam Tunnicliffe; reviewed by Brandon Williams for
CASSANDRA-9682


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

Branch: refs/heads/cassandra-2.0
Commit: 1d54fc339722400b05cc256b21a244c860b9a1bf
Parents: 52dbc3f
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Jul 15 15:29:25 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Jul 15 15:29:25 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/1d54fc33/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 84d562c..a755cb9 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d54fc33/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java b/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
index 2c93afd..815a8d3 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";
     }
 }


[05/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by sa...@apache.org.
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 <sa...@beobal.com>
Authored: Wed Jul 15 16:25:54 2015 +0100
Committer: Sam Tunnicliffe <sa...@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
----------------------------------------------------------------------


[04/10] cassandra git commit: Don't include auth credentials in debug log

Posted by sa...@apache.org.
Don't include auth credentials in debug log

Patch by Sam Tunnicliffe; reviewed by Brandon Williams for
CASSANDRA-9682


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

Branch: refs/heads/trunk
Commit: 1d54fc339722400b05cc256b21a244c860b9a1bf
Parents: 52dbc3f
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Jul 15 15:29:25 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Jul 15 15:29:25 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/1d54fc33/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 84d562c..a755cb9 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d54fc33/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java b/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
index 2c93afd..815a8d3 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";
     }
 }


[08/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by sa...@apache.org.
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 <sa...@beobal.com>
Authored: Wed Jul 15 16:26:44 2015 +0100
Committer: Sam Tunnicliffe <sa...@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
----------------------------------------------------------------------


[06/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by sa...@apache.org.
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.1
Commit: dc79a865316c25e386019a25ad83412fa82c29bb
Parents: 07103dd 1d54fc3
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Jul 15 16:25:54 2015 +0100
Committer: Sam Tunnicliffe <sa...@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
----------------------------------------------------------------------


[10/10] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

Posted by sa...@apache.org.
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 <sa...@beobal.com>
Authored: Wed Jul 15 16:27:09 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
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)


[03/10] cassandra git commit: Don't include auth credentials in debug log

Posted by sa...@apache.org.
Don't include auth credentials in debug log

Patch by Sam Tunnicliffe; reviewed by Brandon Williams for
CASSANDRA-9682


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

Branch: refs/heads/cassandra-2.2
Commit: 1d54fc339722400b05cc256b21a244c860b9a1bf
Parents: 52dbc3f
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Jul 15 15:29:25 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Jul 15 15:29:25 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/1d54fc33/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 84d562c..a755cb9 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d54fc33/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java b/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
index 2c93afd..815a8d3 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";
     }
 }


[02/10] cassandra git commit: Don't include auth credentials in debug log

Posted by sa...@apache.org.
Don't include auth credentials in debug log

Patch by Sam Tunnicliffe; reviewed by Brandon Williams for
CASSANDRA-9682


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

Branch: refs/heads/cassandra-2.1
Commit: 1d54fc339722400b05cc256b21a244c860b9a1bf
Parents: 52dbc3f
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Jul 15 15:29:25 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Wed Jul 15 15:29:25 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/1d54fc33/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 84d562c..a755cb9 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d54fc33/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java b/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java
index 2c93afd..815a8d3 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";
     }
 }


[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by sa...@apache.org.
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/trunk
Commit: dc79a865316c25e386019a25ad83412fa82c29bb
Parents: 07103dd 1d54fc3
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Jul 15 16:25:54 2015 +0100
Committer: Sam Tunnicliffe <sa...@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
----------------------------------------------------------------------


[09/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by sa...@apache.org.
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/trunk
Commit: 82e2004c27ffb0750db9205d9e718efd98218b1a
Parents: 6a40b81 dc79a86
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Jul 15 16:26:44 2015 +0100
Committer: Sam Tunnicliffe <sa...@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
----------------------------------------------------------------------