Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7358fe31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7358fe31 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7358fe31 Branch: refs/heads/trunk Commit: 7358fe31807664e93536dd30fb81ffbc63ee9bea Parents: ebe5921 ebaa755 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Mar 26 22:04:58 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Mar 26 22:04:58 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../src/org/apache/cassandra/stress/StressMetrics.java | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7358fe31/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 611954c,7f88d0f..46d95e5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -37,7 -32,9 +37,8 @@@ * Make OpOrder AutoCloseable (CASSANDRA-6901) * Remove sync repair JMX interface (CASSANDRA-6900) * Add multiple memory allocation options for memtables (CASSANDRA-6689) + * Remove adjusted op rate from stress output (CASSANDRA-6921) Merged from 2.0: - * Restrict Windows to parallel repairs (CASSANDRA-6907) * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) * Fix NPE in MeteredFlusher (CASSANDRA-6820) * Fix race processing range scan responses (CASSANDRA-6820)
