Updated Branches: refs/heads/trunk ad37161c0 -> 486368de9
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/486368de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/486368de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/486368de Branch: refs/heads/trunk Commit: 486368de99c2af444573f73df042840fa68ec5ee Parents: ad37161 dcf89bf Author: Sylvain Lebresne <[email protected]> Authored: Tue Mar 27 17:35:21 2012 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Mar 27 17:35:21 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/config/Avro.java | 2 +- .../org/apache/cassandra/config/CFMetaData.java | 5 ++++- .../apache/cassandra/cql/AlterTableStatement.java | 2 ++ src/java/org/apache/cassandra/cql/CFPropDefs.java | 5 ++++- .../cassandra/cql/CreateColumnFamilyStatement.java | 4 +++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 5 ++++- .../cql3/statements/AlterTableStatement.java | 2 ++ .../statements/CreateColumnFamilyStatement.java | 4 +++- 9 files changed, 25 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/cql/AlterTableStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/cql/CFPropDefs.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/cql3/CFPropDefs.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java ----------------------------------------------------------------------
