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 B185B183B0 for ; Tue, 11 Aug 2015 20:29:45 +0000 (UTC) Received: (qmail 68497 invoked by uid 500); 11 Aug 2015 20:28:46 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 68422 invoked by uid 500); 11 Aug 2015 20:28:46 -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 68039 invoked by uid 99); 11 Aug 2015 20:28:46 -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, 11 Aug 2015 20:28:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 20F8CE1894; Tue, 11 Aug 2015 20:28:46 +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, 11 Aug 2015 20:28:48 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22bfdab5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22bfdab5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22bfdab5 Branch: refs/heads/trunk Commit: 22bfdab50687ef461fa466a998851f7638116c0b Parents: b11be4d 1455837 Author: Robert Stupp Authored: Tue Aug 11 22:27:51 2015 +0200 Committer: Robert Stupp Committed: Tue Aug 11 22:27:51 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Cql.g | 4 +- .../statements/CreateAggregateStatement.java | 24 +++------ .../validation/operations/AggregationTest.java | 56 +++++++++++--------- 3 files changed, 40 insertions(+), 44 deletions(-) ----------------------------------------------------------------------