[4/11] git commit: fix merge

[jb...@apache.org]

fix merge


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

Branch: refs/heads/trunk
Commit: 6b29f91dc9e2c6c1dfe1b713d62dd49fed07c07e
Parents: 782b156
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 25 15:40:26 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 25 15:50:55 2012 -0500

----------------------------------------------------------------------
 NEWS.txt |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b29f91d/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 400b29b..73ec79b 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -8,13 +8,6 @@ upgrade, just in case you need to roll back to the previous version.
 (Cassandra version X + 1 will always be able to read data files created
 by version X, but the inverse is not necessarily the case.)
 
-1.0.10
-======
-
-Upgrading
----------
-    - Nothing specific to 1.0.10
-
 
 1.2
 ===