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/3d4a7e7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d4a7e7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d4a7e7b Branch: refs/heads/trunk Commit: 3d4a7e7b61c7eb2c8736fce2bde47c14564d5982 Parents: 97b1c3c 59d4c27 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Tue Aug 22 09:36:23 2017 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Tue Aug 22 09:36:23 2017 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../src/org/apache/cassandra/stress/StressAction.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d4a7e7b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 59b401c,9e42ffb..75a4be9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -126,6 -6,8 +126,7 @@@ * 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: + * 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/3d4a7e7b/tools/stress/src/org/apache/cassandra/stress/StressAction.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
