Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff42012e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff42012e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff42012e Branch: refs/heads/trunk Commit: ff42012edd8651ca2567a670c2df9b3be6f51fcd Parents: e08d197 6b994ca Author: Sam Tunnicliffe <[email protected]> Authored: Fri Jun 3 10:58:48 2016 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Fri Jun 3 10:58:48 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +-- src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff42012e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2a66eb4,2de1e25..02914cf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -16,6 -13,8 +16,7 @@@ Merged from 3.0 * Refactor Materialized View code (CASSANDRA-11475) * Update Java Driver (CASSANDRA-11615) Merged from 2.2: + * Persist local metadata earlier in startup sequence (CASSANDRA-11742) - * Run CommitLog tests with different compression settings (CASSANDRA-9039) * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664) * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587) * Fix possible race condition in CommitLog.recover (CASSANDRA-11743) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff42012e/src/java/org/apache/cassandra/db/SystemKeyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff42012e/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
