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 B630D1116F for ; Wed, 21 May 2014 18:25:33 +0000 (UTC) Received: (qmail 88935 invoked by uid 500); 21 May 2014 18:25:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 88836 invoked by uid 500); 21 May 2014 18:25:33 -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 88707 invoked by uid 99); 21 May 2014 18:25:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 May 2014 18:25:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3CC039A0FBE; Wed, 21 May 2014 18:25:33 +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: Wed, 21 May 2014 18:25:35 -0000 Message-Id: <6d651985ac5141c59d9a041d2113baf3@git.apache.org> In-Reply-To: <330764ae55554b7eaaa72f921f959372@git.apache.org> References: <330764ae55554b7eaaa72f921f959372@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/f9e2990d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9e2990d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f9e2990d Branch: refs/heads/trunk Commit: f9e2990d54894382380d7f11c8a391b82e4c6d28 Parents: 6581abf e06d74e Author: Jonathan Ellis Authored: Wed May 21 13:25:25 2014 -0500 Committer: Jonathan Ellis Committed: Wed May 21 13:25:25 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/AbstractNativeCell.java | 5 +++-- src/java/org/apache/cassandra/db/NativeCounterCell.java | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) ----------------------------------------------------------------------