Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c9aa93e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c9aa93e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c9aa93e6 Branch: refs/heads/ignite-32 Commit: c9aa93e624de95fce56a6ab79081652a30f675f4 Parents: c8a38a3 a6fad32 Author: vozerov <voze...@gridgain.com> Authored: Wed Dec 24 11:59:04 2014 +0300 Committer: vozerov <voze...@gridgain.com> Committed: Wed Dec 24 11:59:04 2014 +0300 ---------------------------------------------------------------------- .../org/gridgain/grid/kernal/GridKernal.java | 4 + .../java/org/gridgain/grid/util/GridUtils.java | 87 ++++++++++++++------ .../gridgain/grid/util/GridTestClockTimer.java | 31 +++++++ .../testframework/junits/GridAbstractTest.java | 8 ++ 4 files changed, 105 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
