Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61b3d349 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61b3d349 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61b3d349 Branch: refs/heads/trunk Commit: 61b3d3490a3620383587a3693c681c58d4559e1f Parents: cd33e0f 3ae5a4d Author: Jeff Jirsa <j...@jeffjirsa.net> Authored: Fri Feb 10 21:23:15 2017 -0800 Committer: Jeff Jirsa <j...@jeffjirsa.net> Committed: Fri Feb 10 21:23:41 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + tools/stress/src/org/apache/cassandra/stress/StressGraph.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/61b3d349/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b7c7cb8,a69cbe3..d2023cf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -37,6 -7,6 +37,7 @@@ * More fixes to the TokenAllocator (CASSANDRA-12990) * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) Merged from 3.0: ++ * Obfuscate password in stress-graphs (CASSANDRA-12233) * Hint related logging should include the IP address of the destination in addition to host ID (CASSANDRA-13205) * Reloading logback.xml does not work (CASSANDRA-13173)
