cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [7/8] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 17 Apr 2015 23:43:48 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6e43798
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6e43798
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6e43798

Branch: refs/heads/cassandra-2.1
Commit: c6e4379831958a48f421d394a70ddc307341b5bf
Parents: a925262 738229b
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Apr 17 18:43:29 2015 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Apr 17 18:43:29 2015 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/locator/ReconnectableSnitchHelper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



Mime
View raw message