git commit: Fix changelog

[sl...@apache.org]

Updated Branches:
  refs/heads/cassandra-1.1 2c69e2ea7 -> a1c8dad81


Fix changelog


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

Branch: refs/heads/cassandra-1.1
Commit: a1c8dad819ea4f17cf76106fa39dfb3ae60dd797
Parents: 2c69e2e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Sep 7 18:27:31 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Sep 7 18:27:31 2012 +0200

----------------------------------------------------------------------
 CHANGES.txt |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1c8dad8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ed4f026..54a74d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,3 @@
-1.1.6
-  * (cql3) fix potential NPE with both equal and unequal restriction (CASSANDRA-4532)
-  * (cql3) improves ORDER BY validation (CASSANDRA-4624)
-  * Fix potential deadlock during counter writes (CASSANDRA-4578)
-  * Fix cql error with ORDER BY when using IN (CASSANDRA-4612)
-
-
 1.1.5
  * add SecondaryIndex.reload API (CASSANDRA-4581)
  * use millis + atomicint for commitlog segment creation instead of
@@ -21,6 +14,10 @@
  * Respect five-minute flush moratorium after initial CL replay (CASSANDRA-4474)
  * Adds ntp as recommended in debian packaging (CASSANDRA-4606)
  * Configurable transport in CF Record{Reader|Writer} (CASSANDRA-4558)
+ * (cql3) fix potential NPE with both equal and unequal restriction (CASSANDRA-4532)
+ * (cql3) improves ORDER BY validation (CASSANDRA-4624)
+ * Fix potential deadlock during counter writes (CASSANDRA-4578)
+ * Fix cql error with ORDER BY when using IN (CASSANDRA-4612)
 Merged from 1.0:
  * increase Xss to 160k to accomodate latest 1.6 JVMs (CASSANDRA-4602)
  * fix toString of hint destination tokens (CASSANDRA-4568)