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/442d4c9d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/442d4c9d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/442d4c9d Branch: refs/heads/cassandra-3.1 Commit: 442d4c9d40b2116baaf46375cb66d35279d75dae Parents: 29178b2 d300a18 Author: Robert Stupp <sn...@snazy.de> Authored: Fri Nov 27 10:55:26 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Nov 27 10:55:26 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/442d4c9d/CHANGES.txt ----------------------------------------------------------------------
