Updated Branches: refs/heads/trunk 26834f0a4 -> 352993e06
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/352993e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/352993e0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/352993e0 Branch: refs/heads/trunk Commit: 352993e06dbcb4b519d1139497d39d84bc655e29 Parents: 26834f0 6e21cad Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Nov 26 19:23:15 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Nov 26 19:23:15 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/352993e0/CHANGES.txt ----------------------------------------------------------------------
