Merge branch 'cassandra-2.1' into trunk
Conflicts:
test/unit/org/apache/cassandra/service/MoveTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b571d30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b571d30
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b571d30
Branch: refs/heads/trunk
Commit: 9b571d30686f3223834734e167919b115fecda5d
Parents: cf46e44 93942ba
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 31 15:43:23 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 31 15:43:23 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
