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 0471F10053 for ; Tue, 8 Sep 2015 16:22:49 +0000 (UTC) Received: (qmail 76544 invoked by uid 500); 8 Sep 2015 16:22:45 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 76435 invoked by uid 500); 8 Sep 2015 16:22:45 -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 76398 invoked by uid 99); 8 Sep 2015 16:22:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Sep 2015 16:22:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8E437DFF7E; Tue, 8 Sep 2015 16:22:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmckenzie@apache.org To: commits@cassandra.apache.org Date: Tue, 08 Sep 2015 16:22:46 -0000 Message-Id: <161fe4832a7b4994b87fd3ae31524205@git.apache.org> In-Reply-To: <7a668108a8244c2c80e3bc0b8fc92566@git.apache.org> References: <7a668108a8244c2c80e3bc0b8fc92566@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62b6d8ce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62b6d8ce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62b6d8ce Branch: refs/heads/trunk Commit: 62b6d8ce08969a5d4a7e1ff73c661a5b7d1cfbff Parents: 34bbb44 7b083a4 Author: Joshua McKenzie Authored: Tue Sep 8 12:21:30 2015 -0400 Committer: Joshua McKenzie Committed: Tue Sep 8 12:21:30 2015 -0400 ---------------------------------------------------------------------- .../cassandra/io/sstable/SnapshotDeletingTask.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) ----------------------------------------------------------------------