Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2725d503 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2725d503 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2725d503 Branch: refs/heads/trunk Commit: 2725d5035d149e35f267029d10db6b5471041fce Parents: 0aca1b9 9be4370 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Sep 14 08:43:29 2018 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Sep 14 08:43:29 2018 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/compaction/CompactionManager.java | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2725d503/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 06fc935,12c16b7..4f2a649 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.18 +3.11.4 +Merged from 3.0: + * Handle failures in parallelAllSSTableOperation (cleanup/upgradesstables/etc) (CASSANDRA-14657) * Improve TokenMetaData cache populating performance avoid long locking (CASSANDRA-14660) * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638) * sstableloader should use discovered broadcast address to connect intra-cluster (CASSANDRA-14522) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2725d503/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
