cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Date Thu, 31 Jul 2014 20:42:37 GMT
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/cassandra-2.1
Commit: 85bcd2d744ceb3f0d0cef8de6c165c5c2f53b602
Parents: 8e4415b 1879d99
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Thu Jul 31 15:42:02 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
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
----------------------------------------------------------------------


Mime
View raw message