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/2a41dcd0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a41dcd0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a41dcd0 Branch: refs/heads/cassandra-1.2 Commit: 2a41dcd007cfcf7048b8f7aa2599211e4c71b1bc Parents: 33ae090 6e332e3 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Nov 18 21:26:42 2012 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Nov 18 21:26:42 2012 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
