Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Conflicts:
modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c5b8a15
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c5b8a15
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c5b8a15
Branch: refs/heads/ignite-1537
Commit: 6c5b8a151cda74cba9ad384800752700761e8091
Parents: 4225072
Author: sboikov <[email protected]>
Authored: Mon Dec 14 14:13:42 2015 +0300
Committer: sboikov <[email protected]>
Committed: Mon Dec 14 14:13:42 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6c5b8a15/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
index 5308092..594e3c2 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
@@ -80,7 +80,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
private static volatile Marshaller marsh;
/** Test port. */
- private static int port = 55443;
+ private int port = 55443;
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
