Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5_
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e9f22aba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e9f22aba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e9f22aba Branch: refs/heads/ignite-1282 Commit: e9f22aba2801636a3c8747dde143b9ceefeb669a Parents: a8edb1e 2d62bbb Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Nov 27 11:34:04 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Nov 27 11:34:04 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../internal/GridMultipleJobsSelfTest.java | 7 ++++++ .../IgniteClientReconnectCacheTest.java | 26 ++++++++++++-------- 3 files changed, 24 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
