Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e2f380a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e2f380a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e2f380a Branch: refs/heads/trunk Commit: 8e2f380a9eaab2a6fb30361cf1692e31d1e1e03b Parents: aa8828a f4018ea Author: Aleksey Yeschenko <[email protected]> Authored: Thu Dec 13 23:01:34 2012 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Dec 13 23:01:34 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql/CFPropDefs.java | 25 ++++------ .../cassandra/cql/CreateColumnFamilyStatement.java | 3 + src/java/org/apache/cassandra/cql3/CFPropDefs.java | 14 +----- .../statements/CreateColumnFamilyStatement.java | 37 +++++++++------ 5 files changed, 37 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e2f380a/CHANGES.txt ----------------------------------------------------------------------
