Merge branch 'cassandra-3.11' into cassandra-3.X * cassandra-3.11: Use timestamp from ClientState by default in AlterTableStatement Fix test interference in ColumnFamilyStoreTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92cb311f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92cb311f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92cb311f Branch: refs/heads/cassandra-3.X Commit: 92cb311f93099c2acafdc7f80d2fd39a272b4827 Parents: 243be78 0b48977 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Jan 16 10:46:51 2017 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Jan 16 10:46:51 2017 +0100 ---------------------------------------------------------------------- .../cassandra/cql3/statements/AlterKeyspaceStatement.java | 3 ++- .../cassandra/cql3/statements/AlterTableStatement.java | 8 ++++---- .../apache/cassandra/cql3/statements/AlterTypeStatement.java | 3 ++- .../apache/cassandra/cql3/statements/AlterViewStatement.java | 3 ++- .../cassandra/cql3/statements/CreateAggregateStatement.java | 2 +- .../cassandra/cql3/statements/CreateFunctionStatement.java | 2 +- .../cassandra/cql3/statements/CreateIndexStatement.java | 3 ++- .../cassandra/cql3/statements/CreateKeyspaceStatement.java | 2 +- .../cassandra/cql3/statements/CreateTableStatement.java | 2 +- .../cassandra/cql3/statements/CreateTriggerStatement.java | 3 ++- .../cassandra/cql3/statements/CreateTypeStatement.java | 3 ++- .../cassandra/cql3/statements/CreateViewStatement.java | 3 ++- .../cassandra/cql3/statements/DropAggregateStatement.java | 3 ++- .../cassandra/cql3/statements/DropFunctionStatement.java | 3 ++- .../apache/cassandra/cql3/statements/DropIndexStatement.java | 4 ++-- .../cassandra/cql3/statements/DropKeyspaceStatement.java | 3 ++- .../apache/cassandra/cql3/statements/DropTableStatement.java | 3 ++- .../cassandra/cql3/statements/DropTriggerStatement.java | 3 ++- .../apache/cassandra/cql3/statements/DropTypeStatement.java | 3 ++- .../apache/cassandra/cql3/statements/DropViewStatement.java | 3 ++- .../cassandra/cql3/statements/SchemaAlteringStatement.java | 6 +++--- 21 files changed, 41 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
