Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 809F8C2E8 for ; Fri, 25 May 2012 20:52:55 +0000 (UTC) Received: (qmail 35762 invoked by uid 500); 25 May 2012 20:52:54 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 35691 invoked by uid 500); 25 May 2012 20:52:54 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 35603 invoked by uid 99); 25 May 2012 20:52:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2012 20:52:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 69A9117FEA; Fri, 25 May 2012 20:52:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [4/11] git commit: fix merge Message-Id: <20120525205254.69A9117FEA@tyr.zones.apache.org> Date: Fri, 25 May 2012 20:52:54 +0000 (UTC) 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 Authored: Fri May 25 15:40:26 2012 -0500 Committer: Jonathan Ellis 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 ===