Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 d769fcb39 -> 2a2394fdb refs/heads/cassandra-3.0 99d5c3966 -> 34bbb445c refs/heads/trunk 3f6eb5665 -> 002d86b6e
fix CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a2394fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a2394fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a2394fd Branch: refs/heads/cassandra-2.2 Commit: 2a2394fdb0a36b9c9f18c8240fe893fa1b114ec1 Parents: d769fcb Author: Benedict Elliott Smith <bened...@apache.org> Authored: Tue Sep 8 13:54:18 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Tue Sep 8 13:54:18 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a2394fd/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index fdba8ed..d74337e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,3 @@ -<<<<<<< HEAD 2.2.2 * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222) @@ -7,11 +6,8 @@ * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks (CASSANDRA-10199) Merged from 2.1: -======= -2.1.10 * Scrub, Cleanup and Upgrade do not unmark compacting until all operations have completed, regardless of the occurence of exceptions (CASSANDRA-10274) ->>>>>>> 04e789b... Cleanup, scrub and upgrade may unmark compacting early (CASSANDRA-10274) * Fix handling of streaming EOF (CASSANDRA-10206) * Only check KeyCache when it is enabled * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
