Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c176302b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c176302b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c176302b Branch: refs/heads/trunk Commit: c176302bb718584cc8dd92431bdf60fd4b0152f6 Parents: 5dc145f 90de8d5 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Nov 14 10:39:45 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Nov 14 10:39:45 2012 +0100 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
