Merge #22
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/d5941734 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/d5941734 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/d5941734 Branch: refs/heads/master Commit: d59417340fab8b4cca415e9e8e02e0c09eac1c54 Parents: 49a33ae 5361e58 Author: jbertram <jbert...@redhat.com> Authored: Fri Nov 21 14:43:22 2014 -0600 Committer: jbertram <jbert...@redhat.com> Committed: Fri Nov 21 14:43:22 2014 -0600 ---------------------------------------------------------------------- .../core/client/ActiveMQClientLogger.java | 2 +- .../activemq/core/cluster/DiscoveryGroup.java | 45 ++-- .../discovery/DiscoveryBaseTest.java | 257 +++++++++++++++++++ .../discovery/DiscoveryStayAliveTest.java | 154 +++++++++++ .../integration/discovery/DiscoveryTest.java | 223 +--------------- 5 files changed, 443 insertions(+), 238 deletions(-) ----------------------------------------------------------------------
