Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dec1bdb2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dec1bdb2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dec1bdb2 Branch: refs/heads/trunk Commit: dec1bdb20dcbacc8fba1ab8a14c16905a6384a34 Parents: f542a2e 44e475c Author: Marcus Eriksson <[email protected]> Authored: Mon Jul 4 14:17:51 2016 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon Jul 4 14:17:51 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dec1bdb2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 44b6699,b7330f0..309667e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ +3.10 + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + 3.9 + * Increase size of flushExecutor thread pool (CASSANDRA-12071) Merged from 3.0: * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) * Fix EOF exception when altering column type (CASSANDRA-11820)
