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/36da706b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36da706b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36da706b Branch: refs/heads/trunk Commit: 36da706beb549fd6b1975c2fe24e7f5e57e07b43 Parents: d23afc5 613ddc0 Author: Jason Brown <[email protected]> Authored: Mon Jul 24 05:47:47 2017 -0700 Committer: Jason Brown <[email protected]> Committed: Mon Jul 24 05:48:51 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/tools/nodetool/stats/StatsTable.java | 2 +- .../apache/cassandra/tools/nodetool/stats/TableStatsHolder.java | 4 ++-- .../apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36da706b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a68c513,566c970..d5fccee --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -104,6 -4,8 +104,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: -3.0.15 + * Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722) * Purge tombstones created by expired cells (CASSANDRA-13643) * Make concat work with iterators that have different subsets of columns (CASSANDRA-13482) * Set test.runners based on cores and memory size (CASSANDRA-13078) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
