Merge branch 'cassandra-2.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/99ba549d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99ba549d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99ba549d Branch: refs/heads/trunk Commit: 99ba549d0dc378295292c870ed1b68cb757bafc9 Parents: 2306fb8 78e91c4 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Jun 5 08:40:27 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Jun 5 08:40:27 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 9 ++- src/java/org/apache/cassandra/auth/Auth.java | 2 +- .../cql3/statements/AlterKeyspaceStatement.java | 4 +- .../cql3/statements/AlterTableStatement.java | 4 +- .../cql3/statements/AlterTypeStatement.java | 8 +- .../cql3/statements/CreateIndexStatement.java | 4 +- .../statements/CreateKeyspaceStatement.java | 4 +- .../cql3/statements/CreateTableStatement.java | 4 +- .../cql3/statements/CreateTriggerStatement.java | 4 +- .../cql3/statements/CreateTypeStatement.java | 4 +- .../cql3/statements/DropIndexStatement.java | 4 +- .../cql3/statements/DropKeyspaceStatement.java | 4 +- .../cql3/statements/DropTableStatement.java | 4 +- .../cql3/statements/DropTriggerStatement.java | 4 +- .../cql3/statements/DropTypeStatement.java | 4 +- .../statements/SchemaAlteringStatement.java | 16 +++- .../org/apache/cassandra/db/DefsTables.java | 10 ++- src/java/org/apache/cassandra/db/Memtable.java | 7 +- .../cassandra/service/MigrationManager.java | 85 +++++++++++++++++--- .../cassandra/service/StorageService.java | 2 +- .../unit/org/apache/cassandra/SchemaLoader.java | 7 +- .../org/apache/cassandra/cql3/CQLTester.java | 74 +++++++++++++++-- 23 files changed, 202 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/99ba549d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/99ba549d/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/99ba549d/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
