Updated Branches: refs/heads/trunk 653f74ce3 -> cedf6655c
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/cedf6655 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cedf6655 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cedf6655 Branch: refs/heads/trunk Commit: cedf6655c62b5d859b616377485b02901373f973 Parents: 653f74c ead90d2 Author: Sylvain Lebresne <[email protected]> Authored: Mon Nov 19 17:56:02 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Nov 19 17:56:02 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cedf6655/CHANGES.txt ----------------------------------------------------------------------
