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/d6a3845a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6a3845a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6a3845a Branch: refs/heads/trunk Commit: d6a3845a212422c26192a61fe42a3b7e21d34e10 Parents: ac9f478 1772b1c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Dec 28 18:32:36 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Dec 28 18:32:36 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CFPropDefs.java | 22 ++------------- 2 files changed, 4 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6a3845a/CHANGES.txt ----------------------------------------------------------------------