Merge branch 'cassandra-2.0' into cassandra-2.1.0
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/85bcd2d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85bcd2d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85bcd2d7
Branch: refs/heads/trunk
Commit: 85bcd2d744ceb3f0d0cef8de6c165c5c2f53b602
Parents: 8e4415b 1879d99
Author: Tyler Hobbs <[email protected]>
Authored: Thu Jul 31 15:42:02 2014 -0500
Committer: Tyler Hobbs <[email protected]>
Committed: Thu Jul 31 15:42:02 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/MoveTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/85bcd2d7/test/unit/org/apache/cassandra/service/MoveTest.java
----------------------------------------------------------------------
