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/30bfa07a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30bfa07a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30bfa07a Branch: refs/heads/trunk Commit: 30bfa07a48d9a0a2fb206e1b56e9dd9396bc1984 Parents: 391cae6 0e96d3e Author: Benjamin Lerer <[email protected]> Authored: Tue Apr 19 17:53:25 2016 +0200 Committer: Benjamin Lerer <[email protected]> Committed: Tue Apr 19 17:54:12 2016 +0200 ---------------------------------------------------------------------- .../apache/cassandra/cql3/functions/AggregateFcts.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bfa07a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java ----------------------------------------------------------------------
