Merge branch 'cassandra-3.0' into cassandra-3.1

2015-11-16 17:40:05 +01:00 · 2015-11-16 17:40:05 +01:00 · 36e7677147
parent b3231e963c c0480d8bbd
commit 36e7677147
1 changed files with 1 additions and 1 deletions
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
@ -1371,7 +1371,7 @@ public class AggregationTest extends CQLTester
                                             "INITCOND null");

        assertRows(execute("SELECT initcond FROM system_schema.aggregates WHERE keyspace_name=? AND aggregate_name=?", KEYSPACE, shortFunctionName(aggregation)),
-                   row(null));
+                   row((Object) null));

        assertRows(execute("SELECT " + aggregation + "(b) FROM %s"),
                   row(set(7, 8, 9)));