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/5edd148c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5edd148c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5edd148c Branch: refs/heads/trunk Commit: 5edd148c25be8ca409442718f3044e2b12d7c948 Parents: 29066af b0f2266 Author: Robert Stupp <[email protected]> Authored: Sat Feb 20 11:01:55 2016 +0100 Committer: Robert Stupp <[email protected]> Committed: Sat Feb 20 11:01:55 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/schema/SchemaKeyspace.java | 8 ++- .../validation/operations/AggregationTest.java | 60 +++++++++++++++++++- 3 files changed, 65 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5edd148c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5edd148c/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5edd148c/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java ----------------------------------------------------------------------
