Merge branch 'cassandra-3.0' into cassandra-3.7
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/22e0a1da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22e0a1da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22e0a1da
Branch: refs/heads/cassandra-3.7
Commit: 22e0a1daa6b4487a4ee8f6636e7ed1c51648bec2
Parents: a2dd005 7a7704e
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Fri May 27 15:48:22 2016 -0500
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Fri May 27 15:48:22 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/22e0a1da/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0c447f5,d96f3c6..8a854ac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
-3.0.7
+3.7
+ * Don't use static dataDirectories field in Directories instances
(CASSANDRA-11647)
+Merged from 3.0:
+ * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
* Remove unneeded code to repair index summaries that have
been improperly down-sampled (CASSANDRA-11127)
* Avoid WriteTimeoutExceptions during commit log replay due to materialized
http://git-wip-us.apache.org/repos/asf/cassandra/blob/22e0a1da/bin/cqlsh.py
----------------------------------------------------------------------
