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 C112510784 for ; Tue, 1 Apr 2014 09:30:19 +0000 (UTC) Received: (qmail 3183 invoked by uid 500); 1 Apr 2014 09:30:19 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 3150 invoked by uid 500); 1 Apr 2014 09:30:18 -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 2414 invoked by uid 99); 1 Apr 2014 09:30:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2014 09:30:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4307391B40D; Tue, 1 Apr 2014 09:30:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Tue, 01 Apr 2014 09:30:18 -0000 Message-Id: In-Reply-To: <932fe48bee4f4cc79dd5620c4b6ba938@git.apache.org> References: <932fe48bee4f4cc79dd5620c4b6ba938@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] 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/6660970c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6660970c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6660970c Branch: refs/heads/trunk Commit: 6660970c397a0ac53881422a35920bee2bf2d5f7 Parents: 5cdfa69 353b214 Author: Sylvain Lebresne Authored: Tue Apr 1 11:30:06 2014 +0200 Committer: Sylvain Lebresne Committed: Tue Apr 1 11:30:06 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/filter/ColumnCounter.java | 28 ++++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6660970c/CHANGES.txt ----------------------------------------------------------------------