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/d5f1175f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5f1175f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5f1175f Branch: refs/heads/trunk Commit: d5f1175f3cbb99c2d73d5318b838b46b8e2e1c8b Parents: e5db3f2 db40ef8 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Dec 15 10:25:51 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Dec 15 10:25:51 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/CreateTableStatement.java | 7 +- .../cql3/statements/CreateViewStatement.java | 1 + .../cql3/statements/TableAttributes.java | 19 ++++ .../operations/DropRecreateAndRestoreTest.java | 104 +++++++++++++++++++ 5 files changed, 130 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5f1175f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index eadd387,4af7573..0294efc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -21,7 -3,12 +21,8 @@@ Merged from 3.0 (CASSANDRA-10822) Merged from 2.2 * Add property to allow listening on broadcast interface (CASSANDRA-9748) - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) - * Better handling of SSL connection errors inter-node (CASSANDRA-10816) - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) Merged from 2.1: + * Allow CREATE TABLE WITH ID (CASSANDRA-9179) * Make Stress compiles within eclipse (CASSANDRA-10807) * Cassandra Daemon should print JVM arguments (CASSANDRA-10764) * Allow cancellation of index summary redistribution (CASSANDRA-8805)
