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/c3be5ab0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3be5ab0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3be5ab0 Branch: refs/heads/trunk Commit: c3be5ab022972cfe9465151828134075f75794dd Parents: 2d2f55f 5c2912d Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu Oct 1 14:26:42 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu Oct 1 14:26:42 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 3 +++ .../apache/cassandra/db/DefinitionsUpdateVerbHandler.java | 2 +- src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 10 ++++++---- .../org/apache/cassandra/service/MigrationManager.java | 4 ++-- src/java/org/apache/cassandra/service/MigrationTask.java | 2 +- .../org/apache/cassandra/schema/SchemaKeyspaceTest.java | 4 ++-- 7 files changed, 16 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3be5ab0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2df7d8c,5fddce9..efb1efe --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * Flush system schema tables after local schema changes (CASSANDRA-10429) Merged from 2.2: * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
