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/8984ca79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8984ca79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8984ca79 Branch: refs/heads/cassandra-3.0 Commit: 8984ca79f1f9a0fa59642650f7145d572b0a9b9b Parents: e2ad7d5 a5297f1 Author: blerer <benjamin.le...@datastax.com> Authored: Sun Aug 9 21:23:28 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Sun Aug 9 21:23:50 2015 +0200 ---------------------------------------------------------------------- .../cql3/validation/operations/AggregationTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8984ca79/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java ----------------------------------------------------------------------
