Merge branches 'ignite-789' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-789
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b166eea3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b166eea3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b166eea3 Branch: refs/heads/ignite-286 Commit: b166eea368c40bd8f30965c0d48e923f8b8c120c Parents: e7f9b38 0f3d372 Author: Andrey <anovi...@gridgain.com> Authored: Tue Apr 28 17:39:12 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Apr 28 17:39:12 2015 +0700 ---------------------------------------------------------------------- .../ignite/internal/util/GridJavaProcess.java | 4 +++ .../internal/GridDiscoveryEventSelfTest.java | 30 +++++++++++++------- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 5 ++-- 3 files changed, 25 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
