Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40c3e892 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40c3e892 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40c3e892 Branch: refs/heads/trunk Commit: 40c3e892291315dd1531159f5dc5f51e74bb1ac2 Parents: c2e54dd a5be8f1 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Fri Jun 12 13:40:56 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Fri Jun 12 13:40:56 2015 -0500 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 5 +++++ 1 file changed, 5 insertions(+) ----------------------------------------------------------------------