Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c68b30f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c68b30f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c68b30f Branch: refs/heads/trunk Commit: 6c68b30fef95f8f4a621969f5d0434bc2326c2e2 Parents: 5eaa216 fce1735 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Nov 26 02:30:00 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Nov 26 02:30:00 2013 +0300 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c68b30f/doc/cql3/CQL.textile ----------------------------------------------------------------------