fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/06b24679 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06b24679 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06b24679 Branch: refs/heads/trunk Commit: 06b2467942ea4bbcde6341eeff5a66695f8ec2cd Parents: a727717 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri May 25 15:40:26 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri May 25 15:50:46 2012 -0500 ---------------------------------------------------------------------- NEWS.txt | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/06b24679/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index 3368d98..3a4f222 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.1.1 =====
