Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f74063c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f74063c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f74063c6 Branch: refs/heads/trunk Commit: f74063c6eabb809bb59a2a8979d741e707d32797 Parents: d8490cc 1491f75 Author: Tyler Hobbs <ty...@datastax.com> Authored: Thu May 1 13:06:31 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Thu May 1 13:06:31 2014 -0500 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------