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