You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/08/20 14:14:17 UTC

[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/86bca3a0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86bca3a0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86bca3a0

Branch: refs/heads/trunk
Commit: 86bca3a0b90cc8a1e67f0ddac9e33af63898d569
Parents: 0edf547 1964a82
Author: blerer <be...@datastax.com>
Authored: Thu Aug 20 14:12:27 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Thu Aug 20 14:13:23 2015 +0200

----------------------------------------------------------------------
 NEWS.txt                                        |  1 +
 src/java/org/apache/cassandra/cql3/Cql.g        |  9 +----
 .../cassandra/cql3/functions/AggregateFcts.java | 11 ++++++
 .../selection/AbstractFunctionSelector.java     |  6 +++
 .../cassandra/cql3/selection/Selector.java      |  1 -
 .../validation/operations/AggregationTest.java  | 39 ++++++++++++++++++++
 6 files changed, 59 insertions(+), 8 deletions(-)
----------------------------------------------------------------------