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 22916DAF7 for ; Sun, 26 May 2013 00:22:00 +0000 (UTC) Received: (qmail 50012 invoked by uid 500); 26 May 2013 00:21:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49928 invoked by uid 500); 26 May 2013 00:21:59 -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 49914 invoked by uid 99); 26 May 2013 00:21:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 May 2013 00:21:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2A2E1318B01; Sun, 26 May 2013 00:21:58 +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 Date: Sun, 26 May 2013 00:21:59 -0000 Message-Id: <4d612061b16e480096f04cdb8379110a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: clean up merge clean up merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/234d4cfe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/234d4cfe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/234d4cfe Branch: refs/heads/trunk Commit: 234d4cfebaa869e739c0175ed3f50970186ecad1 Parents: 7c9f17f Author: Jonathan Ellis Authored: Sat May 25 19:21:27 2013 -0500 Committer: Jonathan Ellis Committed: Sat May 25 19:21:31 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/234d4cfe/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1acf84e..d3973b6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -92,7 +92,6 @@ Merged from 1.1: (CASSANDRA-5242) * Support pluggable internode authentication (CASSANDRA-5401) -<<<<<<< HEAD 1.2.3 * add check for sstable overlap within a level on startup (CASSANDRA-5327) @@ -118,14 +117,7 @@ Merged from 1.1: * Fix AssertionError during repair (CASSANDRA-5245) * Don't announce migrations to pre-1.2 nodes (CASSANDRA-5334) Merged from 1.1: -||||||| merged common ancestors -1.1.11 * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) -======= - -1.1.11 - * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) ->>>>>>> cassandra-1.1 * Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195) * add tmp flag to Descriptor hashcode (CASSANDRA-4021) * fix logging of "Found table data in data directories" when only system tables