Updated Branches: refs/heads/trunk 7f3704172 -> 950632012
Merge branch 'cassandra-1.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/95063201 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95063201 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95063201 Branch: refs/heads/trunk Commit: 95063201240ef88a7b00eace621a3a35141fb22f Parents: 7f37041 5888fcd Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Feb 23 18:23:06 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Feb 23 18:23:06 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/Schema.java | 2 +- .../org/apache/cassandra/cql/QueryProcessor.java | 1 - .../cql3/statements/SchemaAlteringStatement.java | 1 - src/java/org/apache/cassandra/db/DefsTable.java | 7 + .../cassandra/db/migration/AddColumnFamily.java | 6 +- .../apache/cassandra/db/migration/AddKeyspace.java | 6 +- .../cassandra/db/migration/DropColumnFamily.java | 6 +- .../cassandra/db/migration/DropKeyspace.java | 6 +- .../apache/cassandra/db/migration/Migration.java | 20 +++- .../cassandra/db/migration/MigrationHelper.java | 86 ++++++++++----- .../cassandra/db/migration/UpdateColumnFamily.java | 6 +- .../cassandra/db/migration/UpdateKeyspace.java | 8 +- .../apache/cassandra/service/MigrationManager.java | 14 ++- .../apache/cassandra/service/StorageService.java | 2 +- .../apache/cassandra/thrift/CassandraServer.java | 1 - .../cassandra/config/DatabaseDescriptorTest.java | 42 +++++--- test/unit/org/apache/cassandra/db/DefsTest.java | 15 +++ 18 files changed, 160 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95063201/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95063201/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
