You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/24 07:24:02 UTC

[2/3] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ec6186f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec6186f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec6186f7

Branch: refs/heads/ignite-32
Commit: ec6186f7f0edd5c3b8d1749cf900deed9db140b0
Parents: 3357b96 a6fad32
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Dec 24 11:59:45 2014 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Dec 24 11:59:45 2014 +0700

----------------------------------------------------------------------
 .../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(-)
----------------------------------------------------------------------