Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36e76771 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36e76771 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36e76771 Branch: refs/heads/cassandra-3.1 Commit: 36e7677147607236ab651014ebbff4df052e76be Parents: b3231e9 c0480d8 Author: Robert Stupp <sn...@snazy.de> Authored: Mon Nov 16 17:40:05 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Mon Nov 16 17:40:05 2015 +0100 ---------------------------------------------------------------------- .../cassandra/cql3/validation/operations/AggregationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
