Merge branch 'cassandra-2.1' into trunk
Conflicts:
doc/cql/CQL.textile
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc84af47
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc84af47
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc84af47
Branch: refs/heads/trunk
Commit: dc84af47c34260f62e413c2334111fa91b746dec
Parents: 3a7242e e0b8887
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Tue Jul 22 12:07:00 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Tue Jul 22 12:07:00 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
