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/fec97df3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fec97df3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fec97df3
Branch: refs/heads/trunk
Commit: fec97df341507eeb23ab396a2f24b006994f8584
Parents: c373220 e96b259
Author: Tyler Hobbs <[email protected]>
Authored: Wed Jul 30 17:04:30 2014 -0500
Committer: Tyler Hobbs <[email protected]>
Committed: Wed Jul 30 17:04:30 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
