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/5f83f6c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f83f6c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f83f6c2 Branch: refs/heads/trunk Commit: 5f83f6c2989d756f9c509ad0d4ae49034260e0e6 Parents: 80c51c0 4d0f140 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu Dec 31 15:33:31 2015 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu Dec 31 15:33:31 2015 -0600 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f83f6c2/doc/cql3/CQL.textile ----------------------------------------------------------------------
