Updated Branches: refs/heads/trunk 0608330c5 -> 69accb311
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/69accb31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69accb31 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69accb31 Branch: refs/heads/trunk Commit: 69accb31149aa9d41bcca3aaf2417c014294e888 Parents: 0608330 d17c6f2 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Nov 16 12:39:04 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Nov 16 12:39:04 2012 +0100 ---------------------------------------------------------------------- NEWS.txt | 3 +++ doc/cql3/CQL.textile | 6 +----- src/java/org/apache/cassandra/cql3/Cql.g | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
