Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15122647 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15122647 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15122647 Branch: refs/heads/trunk Commit: 1512264703bc460baa804201a348f6ae82154157 Parents: 5e95684 08deff7 Author: Tyler Hobbs <[email protected]> Authored: Fri Feb 6 16:38:06 2015 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Fri Feb 6 16:38:06 2015 -0600 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15122647/doc/cql3/CQL.textile ----------------------------------------------------------------------
