Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b6b8c95b Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b6b8c95b Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b6b8c95b Branch: refs/heads/master Commit: b6b8c95bf440b3d0467fa678adff543619ea0494 Parents: be12203 4f35637 Author: Matt Gilman <[email protected]> Authored: Sat May 2 16:41:42 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Sat May 2 16:41:42 2015 -0400 ---------------------------------------------------------------------- .../ClusterManagerProtocolSenderImplTest.java | 9 +- .../impl/SocketProtocolListenerTest.java | 133 ++++++++++++ .../ClusterManagerProtocolSenderImplTest.java | 144 ------------- .../impl/ClusterServiceLocatorTest.java | 121 ----------- .../impl/ClusterServicesBroadcasterTest.java | 132 ------------ .../impl/MulticastProtocolListenerTest.java | 171 ---------------- .../impl/NodeProtocolSenderImplTest.java | 202 ------------------- .../impl/SocketProtocolListenerTest.java | 133 ------------ .../testutils/DelayedProtocolHandler.java | 57 ------ .../testutils/ReflexiveProtocolHandler.java | 47 ----- 10 files changed, 136 insertions(+), 1013 deletions(-) ----------------------------------------------------------------------
