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 53238178F9 for ; Thu, 30 Apr 2015 14:55:05 +0000 (UTC) Received: (qmail 84389 invoked by uid 500); 30 Apr 2015 14:55:05 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 84360 invoked by uid 500); 30 Apr 2015 14:55:05 -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 84351 invoked by uid 99); 30 Apr 2015 14:55:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 14:55:05 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.164.171.186 as permitted sender) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 14:54:59 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id CA57747360 for ; Thu, 30 Apr 2015 14:54:08 +0000 (UTC) Received: (qmail 81264 invoked by uid 99); 30 Apr 2015 14:54:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 14:54:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5FA8AE0061; Thu, 30 Apr 2015 14:54:08 +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: Thu, 30 Apr 2015 14:54:24 -0000 Message-Id: <6c129fd1252040a0838949aa103bb42b@git.apache.org> In-Reply-To: <2045542d955e44dc9b090b1a9a973eaa@git.apache.org> References: <2045542d955e44dc9b090b1a9a973eaa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/50] incubator-ignite git commit: Merge branches 'ignite-757' and 'ignite-sprint-4' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-757' and 'ignite-sprint-4' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25879005 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25879005 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25879005 Branch: refs/heads/ignite-732 Commit: 25879005c01b99077f4421780cebc9cfb553eb6c Parents: 876430d d125eb6 Author: anovikov Authored: Tue Apr 28 19:45:11 2015 +0700 Committer: anovikov Committed: Tue Apr 28 19:45:11 2015 +0700 ---------------------------------------------------------------------- .../ignite/internal/GridJobContextImpl.java | 7 +- .../distributed/dht/GridDhtLockRequest.java | 38 ++++---- .../distributed/dht/GridDhtTxPrepareFuture.java | 10 ++- .../distributed/near/GridNearLockRequest.java | 54 ++++++------ .../ignite/internal/util/GridJavaProcess.java | 4 + .../ignite/internal/visor/cache/VisorCache.java | 92 +++++++++++--------- .../visor/node/VisorBasicConfiguration.java | 11 +++ .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 30 ++++--- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 5 +- .../config/VisorConfigurationCommand.scala | 1 + .../scala/org/apache/ignite/visor/visor.scala | 11 +++ pom.xml | 5 +- 13 files changed, 160 insertions(+), 110 deletions(-) ----------------------------------------------------------------------