Updated Branches: refs/heads/cassandra-1.2 d97a5ca4d -> 49a067671 refs/heads/cassandra-1.2.0 64bc3354d -> 27db96653 refs/heads/trunk be89a954b -> a19d5dbbc
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/a19d5dbb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a19d5dbb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a19d5dbb Branch: refs/heads/trunk Commit: a19d5dbbcb324040a2a62b14ddde5fb38cf6f573 Parents: be89a95 49a0676 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Nov 23 15:51:06 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Nov 23 15:51:06 2012 -0600 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 2 ++ .../cassandra/cql3/statements/SelectStatement.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------