Updated Branches: refs/heads/cassandra-1.1 aba9a1774 -> 2b87bfe55 refs/heads/trunk 62ff2942a -> adfc94a3b
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adfc94a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adfc94a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adfc94a3 Branch: refs/heads/trunk Commit: adfc94a3bef0a94b6905f827e4ba27e03953f237 Parents: 62ff294 268e5b1 Author: Brandon Williams <[email protected]> Authored: Wed Mar 6 16:06:08 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Wed Mar 6 16:06:08 2013 -0600 ---------------------------------------------------------------------- .../cassandra/gms/GossipDigestAck2VerbHandler.java | 6 ++++++ src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/adfc94a3/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
