Merge branch 'cassandra-2.0' into cassandra-2.1.0
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/17b26a2a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17b26a2a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17b26a2a
Branch: refs/heads/cassandra-2.1
Commit: 17b26a2ae783dab18a7947f6eaf1b7e91dec94ab
Parents: 72676dd 59c7e25
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 24 17:59:23 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 24 17:59:23 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
