Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4E7EE10F76 for ; Fri, 26 Dec 2014 09:14:40 +0000 (UTC) Received: (qmail 68269 invoked by uid 500); 26 Dec 2014 09:14:40 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 68239 invoked by uid 500); 26 Dec 2014 09:14:40 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 68230 invoked by uid 99); 26 Dec 2014 09:14:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Dec 2014 09:14:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 26 Dec 2014 09:14:18 +0000 Received: (qmail 67985 invoked by uid 99); 26 Dec 2014 09:14:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Dec 2014 09:14:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E30DAA38FEF; Fri, 26 Dec 2014 09:14:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 26 Dec 2014 09:14:18 -0000 Message-Id: In-Reply-To: <9406cf4211964dab8dcd897458ad755c@git.apache.org> References: <9406cf4211964dab8dcd897458ad755c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/8] incubator-ignite git commit: Merge remote-tracking branch 'origin/master' X-Virus-Checked: Checked by ClamAV on apache.org 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-44 Commit: c9aa93e624de95fce56a6ab79081652a30f675f4 Parents: c8a38a3 a6fad32 Author: vozerov Authored: Wed Dec 24 11:59:04 2014 +0300 Committer: vozerov 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(-) ----------------------------------------------------------------------