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 79D3B18AE5 for ; Tue, 18 Aug 2015 12:41:08 +0000 (UTC) Received: (qmail 74042 invoked by uid 500); 18 Aug 2015 12:41:08 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 73926 invoked by uid 500); 18 Aug 2015 12:41:08 -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 73850 invoked by uid 99); 18 Aug 2015 12:41:08 -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, 18 Aug 2015 12:41:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0DEECE0427; Tue, 18 Aug 2015 12:41:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Date: Tue, 18 Aug 2015 12:41:09 -0000 Message-Id: In-Reply-To: <708c4b095fa042028f5eb70c0d171e92@git.apache.org> References: <708c4b095fa042028f5eb70c0d171e92@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/310378d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/310378d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/310378d5 Branch: refs/heads/cassandra-3.0 Commit: 310378d56785fda211166b9d7a78daea0586ca9b Parents: 2923011 6d9fa37 Author: Robert Stupp Authored: Tue Aug 18 14:39:41 2015 +0200 Committer: Robert Stupp Committed: Tue Aug 18 14:39:41 2015 +0200 ---------------------------------------------------------------------- .../cassandra/cql3/validation/operations/AggregationTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/310378d5/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java ----------------------------------------------------------------------