[5/7] git commit: Fix changelog

[sl...@apache.org]

Fix changelog


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

Branch: refs/heads/cassandra-1.1
Commit: ac8d60b41f15cf79de48ad0d0a05949a19d8cee2
Parents: 9a3acc8
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 13 12:37:39 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 13 12:37:39 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac8d60b4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d7a595b..77111c4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 1.1-dev
  * start hint replay as soon as FD notifies that the target is back up
    (CASSANDRA-3958)
@@ -25,11 +24,6 @@ Merged from 1.0:
  * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)
  * (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767)
  * Fix short read protection (CASSANDRA-3934)
- * don't change manifest level for cleanup, scrub, and upgradesstables
-   operations under LeveledCompactionStrategy (CASSANDRA-3989)
-=======
-1.0.9
->>>>>>> cassandra-1.0
  * always compact away deleted hints immediately after handoff (CASSANDRA-3955)
  * delete hints from dropped ColumnFamilies on handoff instead of
    erroring out (CASSANDRA-3975)