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/4b777d62 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b777d62 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b777d62 Branch: refs/heads/trunk Commit: 4b777d6271b8900f00a23e51aa3d8e42b7a0f34b Parents: 2e5847d 000007f Author: AndreÌs de la PenÌa <a.penya.gar...@gmail.com> Authored: Thu Aug 24 17:03:41 2017 +0100 Committer: AndreÌs de la PenÌa <a.penya.gar...@gmail.com> Committed: Thu Aug 24 17:03:41 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 6 ++++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b777d62/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 92ff455,d39f78c..0a4726b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -130,8 -6,10 +130,9 @@@ * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) Merged from 3.0: + * Copy session properties on cqlsh.py do_login (CASSANDRA-13640) * Potential AssertionError during ReadRepair of range tombstone and partition deletions (CASSANDRA-13719) * Don't let stress write warmup data if n=0 (CASSANDRA-13773) - * Gossip thread slows down when using batch commit log (CASSANDRA-12966) * Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884) * Fix digest calculation for counter cells (CASSANDRA-13750) * Fix ColumnDefinition.cellValueType() for non-frozen collection and change SSTabledump to use type.toJSONString() (CASSANDRA-13573) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b777d62/bin/cqlsh.py ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
