Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1758
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/25609b33 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/25609b33 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/25609b33 Branch: refs/heads/ignite-1758 Commit: 25609b33a1827eea5f925326a1220b295382df5d Parents: e7a04f3 Author: sboikov <[email protected]> Authored: Tue Nov 10 10:14:47 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Nov 10 10:14:47 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/25609b33/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java index 269ea18..72549b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java @@ -162,7 +162,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { /** * @throws Exception If any error occurs. */ - public void testMultiThreadedClientsRestart() throws Exception { + public void _testMultiThreadedClientsRestart() throws Exception { final AtomicBoolean done = new AtomicBoolean(); try {
