Repository: cassandra Updated Branches: refs/heads/cassandra-3.3 bdcc059a4 -> 4d5873d81 refs/heads/trunk 32e2e83cf -> 4a241f626
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/4d5873d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d5873d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d5873d8 Branch: refs/heads/cassandra-3.3 Commit: 4d5873d81bc13cbe0c8cc6cf04836a58801c204c Parents: bdcc059 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Mon Feb 1 16:12:02 2016 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Mon Feb 1 16:12:02 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d5873d8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 394faaf..aa4f981 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -358,8 +358,7 @@ Merged from 2.2: * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks (CASSANDRA-10199) Merged from 2.1: - * ure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045) -dded configurable warning threshold for GC duration (CASSANDRA-8907) + * Added configurable warning threshold for GC duration (CASSANDRA-8907) * 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)