cassandra git commit: Merge 3.12 and 4.0 section in CHANGES.txt

[bl...@apache.org]

Repository: cassandra
Updated Branches:
  refs/heads/trunk 369e7aa4c -> 30e1392d2


Merge 3.12 and 4.0 section in CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30e1392d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30e1392d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30e1392d

Branch: refs/heads/trunk
Commit: 30e1392d21e4fe50850dd22e3b30372b271ac0c4
Parents: 369e7aa
Author: Benjamin Lerer <b....@gmail.com>
Authored: Wed Jan 18 16:21:47 2017 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Wed Jan 18 16:21:47 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/30e1392d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4614ff7..7bdf61f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,9 +8,6 @@
  * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
  * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
  * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
-
-
-3.12
  * Use new token allocation for non bootstrap case as well (CASSANDRA-13080)
  * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
  * More fixes to the TokenAllocator (CASSANDRA-12990)