Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-44
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/090bf073 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/090bf073 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/090bf073 Branch: refs/heads/ignite-54 Commit: 090bf073fd8a00c4a1fec7b0cf271bf3aacdda3c Parents: bcb30d1 2540451 Author: sboikov <sboi...@gridgain.com> Authored: Fri Dec 26 12:13:37 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Dec 26 12:13:37 2014 +0300 ---------------------------------------------------------------------- .../org/gridgain/grid/kernal/GridKernal.java | 4 + .../interop/GridInteropProcessor.java | 9 ++ .../interop/os/GridOsInteropProcessor.java | 5 ++ .../java/org/gridgain/grid/util/GridUtils.java | 87 ++++++++++++++------ .../tcp/GridOrderedMessageCancelSelfTest.java | 28 ++++--- .../gridgain/grid/util/GridTestClockTimer.java | 31 +++++++ .../testframework/junits/GridAbstractTest.java | 8 ++ 7 files changed, 136 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/090bf073/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java ----------------------------------------------------------------------
