Updated Branches: refs/heads/cassandra-1.2 f5e3ae67c -> dda7aee34 refs/heads/cassandra-1.2.0 f5e3ae67c -> dda7aee34 refs/heads/trunk 880188384 -> fa8550f35
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/fa8550f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa8550f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa8550f3 Branch: refs/heads/trunk Commit: fa8550f35552f16f4c268f7f39c63899f766ca35 Parents: 8801883 dda7aee Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Nov 9 16:55:39 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Nov 9 16:55:39 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
