Updated Branches: refs/heads/cassandra-1.1 5923d3295 -> 1ea2a60e8
Move CF and KS validation out of thrift patch by slebresne; reviewed by jbellis for CASSANDRA-4037 (backport from cassandra-1.1 for CASSANDRA-4093 sakes) Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql/AlterTableStatement.java src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56dc5df7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56dc5df7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56dc5df7 Branch: refs/heads/cassandra-1.1 Commit: 56dc5df7b435db8ffd468f3add01077527067589 Parents: 5923d32 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Mar 16 09:30:34 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Apr 9 19:01:34 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56dc5df7/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b80368a..1e175b1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -23,6 +23,7 @@ non-Windows platforms (CASSANDRA-4110) * fix terminination of the stress.java when errors were encountered (CASSANDRA-4128) + * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037) Merged from 1.0: * allow short snitch names (CASSANDRA-4130)