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/5c5cc540 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c5cc540 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c5cc540 Branch: refs/heads/trunk Commit: 5c5cc540facef9f8645a179e1467ad7edffbda48 Parents: 2bc5f0c 3079ae6 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Apr 27 17:58:12 2016 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Apr 27 17:58:12 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../cql3/statements/AlterTableStatement.java | 2 +- .../cassandra/cql3/statements/AlterTypeStatement.java | 2 +- .../cql3/statements/CreateIndexStatement.java | 2 +- .../cql3/statements/CreateTriggerStatement.java | 2 +- .../cassandra/cql3/statements/DropIndexStatement.java | 2 +- .../cql3/statements/DropTriggerStatement.java | 2 +- .../org/apache/cassandra/schema/SchemaKeyspace.java | 14 ++------------ .../apache/cassandra/service/MigrationManager.java | 8 ++++---- .../org/apache/cassandra/thrift/CassandraServer.java | 2 +- test/unit/org/apache/cassandra/schema/DefsTest.java | 14 +++++++------- .../apache/cassandra/schema/SchemaKeyspaceTest.java | 2 +- .../apache/cassandra/triggers/TriggersSchemaTest.java | 4 ++-- 13 files changed, 25 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5cc540/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5cc540/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5cc540/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5cc540/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5cc540/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5cc540/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c5cc540/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
