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 <snazy@snazy.de>
Authored: Tue Aug 11 22:27:51 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
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(-)
----------------------------------------------------------------------
|