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 5C92F10B9E for ; Fri, 28 Feb 2014 16:08:50 +0000 (UTC) Received: (qmail 59727 invoked by uid 500); 28 Feb 2014 16:08:48 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 59614 invoked by uid 500); 28 Feb 2014 16:08:47 -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 58624 invoked by uid 99); 28 Feb 2014 16:08:40 -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, 28 Feb 2014 16:08:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EFEC3930AB9; Fri, 28 Feb 2014 16:08:39 +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: Fri, 28 Feb 2014 16:08:47 -0000 Message-Id: In-Reply-To: <99eff78e9b604a15afbc3cc247fb7bac@git.apache.org> References: <99eff78e9b604a15afbc3cc247fb7bac@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [9/9] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c186bef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c186bef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c186bef Branch: refs/heads/trunk Commit: 3c186bef82e61331951b79df4cce05c0a0f11ebb Parents: b23d6ba b41eb4a Author: Jonathan Ellis Authored: Fri Feb 28 10:08:36 2014 -0600 Committer: Jonathan Ellis Committed: Fri Feb 28 10:08:36 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 9 +++++---- .../org/apache/cassandra/db/compaction/CompactionTask.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c186bef/CHANGES.txt ----------------------------------------------------------------------