[2/2] git commit: Changelog update

[sl...@apache.org]

Changelog update


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

Branch: refs/heads/cassandra-1.2
Commit: a6ca5d496facf79c187310e81b3eeba3e6bc4b43
Parents: 2d90eb6
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jun 25 09:58:10 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jun 25 09:58:10 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6ca5d49/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index be0c1d0..2931916 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,3 @@
-1.2.7
- * Fix ReadResponseSerializer.serializedSize() for digest reads (CASSANDRA-5476)
- * allow sstable2json on 2i CFs (CASSANDRA-5694)
-
-
 1.2.6
  * Fix tracing when operation completes before all responses arrive (CASSANDRA-5668)
  * Fix cross-DC mutation forwarding (CASSANDRA-5632)
@@ -39,6 +34,8 @@
  * Gossiper incorrectly drops AppState for an upgrading node (CASSANDRA-5660)
  * Connection thrashing during multi-region ec2 during upgrade, due to messaging version (CASSANDRA-5669)
  * Avoid over reconnecting in EC2MRS (CASSANDRA-5678)
+ * Fix ReadResponseSerializer.serializedSize() for digest reads (CASSANDRA-5476)
+ * allow sstable2json on 2i CFs (CASSANDRA-5694)
 Merged from 1.1:
  * Remove buggy thrift max message length option (CASSANDRA-5529)
  * Fix NPE in Pig's widerow mode (CASSANDRA-5488)