[jgroups-git] [belaban/JGroups] fce16f: backported changes from master/JGRP-1315

[<no...@gi...>]

  Branch: refs/heads/Branch_JGroups_2_12
  Home:   https://github.com/belaban/JGroups

  Commit: fce16f185de74891e4bd534b5d7ae5494d5036ba
      https://github.com/belaban/JGroups/commit/fce16f185de74891e4bd534b5d7ae5494d5036ba
  Author: Bela Ban <be...@ya...>
  Date:   2011-08-15 (Mon, 15 Aug 2011)

  Changed paths:
    M src/org/jgroups/Event.java
  M src/org/jgroups/protocols/Discovery.java
  M src/org/jgroups/protocols/FILE_PING.java
  M src/org/jgroups/protocols/MERGE2.java
  M src/org/jgroups/protocols/PING.java
  M src/org/jgroups/protocols/PingData.java
  M src/org/jgroups/protocols/PingHeader.java
  M src/org/jgroups/protocols/TCPGOSSIP.java
  M src/org/jgroups/protocols/TCPPING.java
  M src/org/jgroups/util/Util.java

  Log Message:
  -----------
  backported changes from master/JGRP-1315