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/6e21cad7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e21cad7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e21cad7 Branch: refs/heads/trunk Commit: 6e21cad7115d7df3ee28832ac489b0fc5c529813 Parents: 2f7fbba b44abad Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Nov 26 19:22:58 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Nov 26 19:22:58 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../statements/CreateColumnFamilyStatement.java | 3 +++ .../cassandra/cql3/statements/SelectStatement.java | 5 +++++ 3 files changed, 10 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e21cad7/CHANGES.txt ----------------------------------------------------------------------
