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/4c387e46
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c387e46
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c387e46
Branch: refs/heads/cassandra-2.1
Commit: 4c387e46dd8a1da699487c6a5432643eb0972bd1
Parents: ef08f94 2692c29
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Mon Aug 11 17:32:03 2014 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Mon Aug 11 17:32:03 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
