Updated Branches: refs/heads/trunk 8cb7bc4af -> 8646f9763
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/8646f976 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8646f976 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8646f976 Branch: refs/heads/trunk Commit: 8646f976331be6d024cfbc8fca10616601ea8953 Parents: 6b02851 9717002 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Jan 18 14:38:59 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jan 18 14:38:59 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 3 ++- src/java/org/apache/cassandra/cql3/Cql.g | 7 ++++++- 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8646f976/CHANGES.txt ----------------------------------------------------------------------
