Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0b88878
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0b88878
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0b88878
Branch: refs/heads/trunk
Commit: e0b88878c52b6692d2391b398372d5f5f2a83aff
Parents: f9af6ab e740c29
Author: Tyler Hobbs <[email protected]>
Authored: Tue Jul 22 12:06:11 2014 -0500
Committer: Tyler Hobbs <[email protected]>
Committed: Tue Jul 22 12:06:11 2014 -0500
----------------------------------------------------------------------
doc/cql/CQL.textile | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
