Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dbc8dd6a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbc8dd6a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbc8dd6a Branch: refs/heads/trunk Commit: dbc8dd6a97aca543a51b6fc6cf8da96debf2663a Parents: 1c5238c 442d4c9 Author: Robert Stupp <[email protected]> Authored: Fri Nov 27 10:55:32 2015 +0100 Committer: Robert Stupp <[email protected]> Committed: Fri Nov 27 10:55:32 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/DropAggregateStatement.java | 15 ++++---- .../cql3/statements/DropFunctionStatement.java | 27 +++++++++----- .../cql3/statements/DropTableStatement.java | 2 ++ .../cql3/statements/DropTypeStatement.java | 10 ++++-- .../org/apache/cassandra/cql3/ViewTest.java | 10 ++++++ .../cql3/validation/entities/TypeTest.java | 10 ++++++ .../cql3/validation/entities/UFTest.java | 14 ++++++++ .../validation/operations/AggregationTest.java | 14 ++++++++ .../cql3/validation/operations/DropTest.java | 37 ++++++++++++++++++++ 10 files changed, 123 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbc8dd6a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbc8dd6a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java ----------------------------------------------------------------------
