Repository: cassandra Updated Branches: refs/heads/trunk 2f3fd416f -> 39deb31c4
Remove merge markers from NEWS.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39deb31c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39deb31c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39deb31c Branch: refs/heads/trunk Commit: 39deb31c439185c7e17bec70c6930f43eb685d43 Parents: 2f3fd41 Author: Tyler Hobbs <[email protected]> Authored: Wed Mar 11 10:42:53 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Mar 11 10:42:53 2015 -0500 ---------------------------------------------------------------------- NEWS.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39deb31c/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index bfe7313..d68460b 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -13,7 +13,6 @@ restore snapshots created with the previous major version using the 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. -<<<<<<< HEAD 3.0 === @@ -75,10 +74,9 @@ Upgrading in the normal order and not anymore in the order in which the column values were specified in the IN restriction. -======= ->>>>>>> cassandra-2.1 2.1.4 ===== + Upgrading --------- - The option to omit cold sstables with size tiered compaction has been
