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 CBF0817C0E for ; Sat, 2 May 2015 20:03:07 +0000 (UTC) Received: (qmail 38437 invoked by uid 500); 2 May 2015 20:03:07 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 38402 invoked by uid 500); 2 May 2015 20:03:07 -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 38393 invoked by uid 99); 2 May 2015 20:03:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 May 2015 20:03:07 +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: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 May 2015 20:03:02 +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 A02D247617 for ; Sat, 2 May 2015 19:48:26 +0000 (UTC) Received: (qmail 13231 invoked by uid 99); 2 May 2015 15:48:25 -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; Sat, 02 May 2015 15:48:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3D3B1E17CB; Sat, 2 May 2015 15:48:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Sat, 02 May 2015 15:48:37 -0000 Message-Id: In-Reply-To: <766ae88b48f6458c9e484783c5a7a015@git.apache.org> References: <766ae88b48f6458c9e484783c5a7a015@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-728' into ignite-728 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'origin/ignite-728' into ignite-728 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8ae6b031 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8ae6b031 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8ae6b031 Branch: refs/heads/ignite-709_2 Commit: 8ae6b0319db2e92d7316533d9946bba51d2174c1 Parents: b58e1ac ef7d011 Author: Yakov Zhdanov Authored: Wed Apr 29 18:01:02 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Apr 29 18:01:02 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/Ignition.java | 44 ++++ .../ignite/internal/GridJobContextImpl.java | 7 +- .../org/apache/ignite/internal/IgnitionEx.java | 165 +++++++++++++- .../processors/cache/GridCacheMvccManager.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 ++++- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtLockRequest.java | 38 ++-- .../distributed/dht/GridDhtTxFinishFuture.java | 102 ++++++++- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 ++ .../distributed/dht/GridDhtTxPrepareFuture.java | 10 +- .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../distributed/near/GridNearLockRequest.java | 54 ++--- .../cache/distributed/near/GridNearTxLocal.java | 6 + .../cache/transactions/IgniteInternalTx.java | 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 ++++- .../cache/transactions/IgniteTxManager.java | 117 ++++++++-- .../ignite/internal/util/GridJavaProcess.java | 4 + .../util/spring/IgniteSpringHelper.java | 54 ++++- .../ignite/internal/visor/cache/VisorCache.java | 92 ++++---- .../visor/node/VisorBasicConfiguration.java | 11 + .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 30 ++- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- .../cache/IgniteCachePutAllRestartTest.java | 203 +++++++++++++++++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 ++- ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 7 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 2 - .../near/IgniteCacheNearTxRollbackTest.java | 133 ++++++++++++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 5 +- .../IgniteCacheFailoverTestSuite.java | 8 +- .../testsuites/IgniteCacheRestartTestSuite.java | 3 +- .../util/spring/IgniteSpringHelperImpl.java | 217 +++++++++++++++---- .../IgniteStartFromStreamConfigurationTest.java | 50 +++++ .../testsuites/IgniteSpringTestSuite.java | 2 + .../config/VisorConfigurationCommand.scala | 1 + .../scala/org/apache/ignite/visor/visor.scala | 11 + pom.xml | 5 +- 40 files changed, 1396 insertions(+), 213 deletions(-) ----------------------------------------------------------------------