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/trunk Commit: 310378d56785fda211166b9d7a78daea0586ca9b Parents: 2923011 6d9fa37 Author: Robert Stupp <sn...@snazy.de> Authored: Tue Aug 18 14:39:41 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> 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 ----------------------------------------------------------------------
