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/e3f9b7a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3f9b7a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3f9b7a3 Branch: refs/heads/cassandra-3.8 Commit: e3f9b7a3b6ec5df1c65bd6324d2c312209183cf8 Parents: fb4eb5a Author: Benjamin Lerer <b.le...@gmail.com> Authored: Thu Jul 14 11:46:14 2016 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Thu Jul 14 11:46:14 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3f9b7a3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index bedba6d..ba8e299 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,14 +1,10 @@ -<<<<<<< HEAD 3.9 * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) * Fix hdr logging for single operation workloads (CASSANDRA-12145) * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) * Increase size of flushExecutor thread pool (CASSANDRA-12071) Merged from 3.0: -======= -3.0.9 * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393) ->>>>>>> asf/cassandra-3.0 * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315) * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
