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 0E40A11B85 for ; Wed, 14 May 2014 03:19:03 +0000 (UTC) Received: (qmail 28814 invoked by uid 500); 14 May 2014 02:19:02 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 28630 invoked by uid 500); 14 May 2014 02:19:02 -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 28613 invoked by uid 99); 14 May 2014 02:19:02 -0000 Received: from Unknown (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 02:19:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7F9DD8B6EF9; Wed, 14 May 2014 02:19:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Wed, 14 May 2014 02:19:03 -0000 Message-Id: <72b0c78f9b654bee920fcc2ff0ac8f77@git.apache.org> In-Reply-To: <7f54f26aa6224eab9801ba072d03cde7@git.apache.org> References: <7f54f26aa6224eab9801ba072d03cde7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/3cb73610 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3cb73610 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3cb73610 Branch: refs/heads/trunk Commit: 3cb736101bc69fb64b7911f0ebbb73d3a08b9cc5 Parents: 442f302 50c18fd Author: Jake Luciani Authored: Tue May 13 22:18:48 2014 -0400 Committer: Jake Luciani Committed: Tue May 13 22:18:48 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/NativeCounterCell.java | 7 +++++++ 1 file changed, 7 insertions(+) ----------------------------------------------------------------------