Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/171889c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/171889c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/171889c8 Branch: refs/heads/trunk Commit: 171889c803545ee81ec7a723d048f2ed13dfb9f7 Parents: 14dcc48 df52cd6 Author: Marcus Eriksson <[email protected]> Authored: Thu Aug 20 18:16:16 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu Aug 20 18:16:16 2015 +0200 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
