cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Date Wed, 06 Mar 2013 22:10:15 GMT
Updated Branches:
  refs/heads/cassandra-1.2 86e2cc579 -> 62b1ee40b
  refs/heads/trunk adfc94a3b -> 66e6f2969


Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java


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

Branch: refs/heads/trunk
Commit: 66e6f2969dc7a87ab75776b9ca1ad3111b24829a
Parents: adfc94a 62b1ee4
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Mar 6 16:09:56 2013 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Mar 6 16:09:56 2013 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------



Mime
View raw message