Updated Branches: refs/heads/trunk 64305dd9f -> b2cb52d8a
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/b2cb52d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2cb52d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2cb52d8 Branch: refs/heads/trunk Commit: b2cb52d8a76e85eef6f2213694a7943d49826ab8 Parents: 64305dd 1ea2a60 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Apr 9 19:03:13 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Apr 9 19:03:13 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + interface/cassandra.thrift | 2 - .../org/apache/cassandra/thrift/Cassandra.java | 330 +++++++-------- .../org/apache/cassandra/thrift/CfDef.java | 258 +----------- .../org/apache/cassandra/thrift/CqlMetadata.java | 44 +- .../apache/cassandra/thrift/CqlPreparedResult.java | 16 +- .../org/apache/cassandra/thrift/CqlResult.java | 18 +- .../org/apache/cassandra/thrift/CqlRow.java | 18 +- .../org/apache/cassandra/thrift/KsDef.java | 40 +- src/java/org/apache/cassandra/config/Avro.java | 2 +- .../org/apache/cassandra/config/CFMetaData.java | 131 +++--- .../apache/cassandra/config/ColumnDefinition.java | 59 ++- .../org/apache/cassandra/config/KSMetaData.java | 2 +- .../apache/cassandra/cql/AlterTableStatement.java | 1 + .../cassandra/cql/CreateColumnFamilyStatement.java | 2 +- .../cql3/statements/AlterTableStatement.java | 4 +- .../statements/CreateColumnFamilyStatement.java | 3 +- test/unit/org/apache/cassandra/SchemaLoader.java | 4 +- .../cassandra/config/ColumnDefinitionTest.java | 4 +- .../unit/org/apache/cassandra/config/DefsTest.java | 10 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 2 +- .../cassandra/thrift/ThriftValidationTest.java | 2 +- 22 files changed, 370 insertions(+), 583 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2cb52d8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2cb52d8/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2cb52d8/src/java/org/apache/cassandra/config/ColumnDefinition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2cb52d8/src/java/org/apache/cassandra/config/KSMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2cb52d8/src/java/org/apache/cassandra/cql/AlterTableStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2cb52d8/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2cb52d8/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2cb52d8/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java ----------------------------------------------------------------------
