Repository: incubator-ignite Updated Branches: refs/heads/ignite-54 3344e7271 -> 9a1b04122
Merge remote-tracking branch 'remotes/origin/master' into ignite-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c64771d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c64771d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c64771d4 Branch: refs/heads/ignite-54 Commit: c64771d446de206868eba39a43c654f704d95b50 Parents: e4881d2 c9aa93e Author: sboikov <sboi...@gridgain.com> Authored: Wed Dec 24 13:03:44 2014 +0400 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Dec 24 13:03:44 2014 +0400 ---------------------------------------------------------------------- .../org/gridgain/grid/kernal/GridKernal.java | 4 + .../interop/GridInteropProcessor.java | 9 ++ .../interop/os/GridOsInteropProcessor.java | 5 ++ .../java/org/gridgain/grid/util/GridUtils.java | 87 ++++++++++++++------ .../gridgain/grid/util/GridTestClockTimer.java | 31 +++++++ .../testframework/junits/GridAbstractTest.java | 8 ++ 6 files changed, 119 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c64771d4/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java ----------------------------------------------------------------------
