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 EE9E818A19 for ; Mon, 12 Oct 2015 04:06:19 +0000 (UTC) Received: (qmail 58870 invoked by uid 500); 12 Oct 2015 04:06:19 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 58793 invoked by uid 500); 12 Oct 2015 04:06:19 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 58704 invoked by uid 99); 12 Oct 2015 04:06:19 -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; Mon, 12 Oct 2015 04:06:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 15FCADFC92; Mon, 12 Oct 2015 04:06:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Date: Mon, 12 Oct 2015 04:06:22 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] ignite git commit: Merge branches 'ignite-1168' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168 Merge branches 'ignite-1168' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e580866a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e580866a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e580866a Branch: refs/heads/ignite-843 Commit: e580866a0878d0ba7841b26d889aa5f02477fca6 Parents: 5ef7c38 a1e5cc5 Author: Andrey Authored: Mon Oct 12 08:43:07 2015 +0700 Committer: Andrey Committed: Mon Oct 12 08:43:07 2015 +0700 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 17 +- .../internal/portable/PortableContext.java | 7 + .../portable/api/PortableMarshaller.java | 14 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 8 +- .../colocated/GridDhtColocatedLockFuture.java | 11 +- .../distributed/near/GridNearLockFuture.java | 11 +- .../near/GridNearOptimisticTxPrepareFuture.java | 24 +- .../datastructures/DataStructuresProcessor.java | 48 +- .../ignite/internal/util/GridJavaProcess.java | 12 +- .../ignite/internal/util/lang/GridFunc.java | 12 + .../apache/ignite/marshaller/Marshaller.java | 2 +- .../optimized/OptimizedMarshallerUtils.java | 6 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 486 ++++--- .../CacheGetFutureHangsSelfTest.java | 3 + .../CacheNoValueClassOnServerNodeTest.java | 1 + ...niteCacheClientNodeChangingTopologyTest.java | 6 +- ...gniteAtomicLongChangingTopologySelfTest.java | 155 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 71 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 129 +- .../testframework/junits/GridAbstractTest.java | 116 +- .../junits/IgniteTestResources.java | 8 +- .../junits/common/GridCommonAbstractTest.java | 15 +- .../junits/multijvm/AffinityProcessProxy.java | 440 ++++-- .../multijvm/IgniteCacheProcessProxy.java | 1346 ++++++++++++++---- .../multijvm/IgniteClusterProcessProxy.java | 115 +- .../multijvm/IgniteEventsProcessProxy.java | 50 +- .../junits/multijvm/IgniteNodeRunner.java | 39 +- .../junits/multijvm/IgniteProcessProxy.java | 107 +- .../cache/CacheConfigurationP2PTest.java | 3 + .../visor/commands/kill/VisorKillCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 1 - 31 files changed, 2402 insertions(+), 863 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e580866a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ----------------------------------------------------------------------