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 6E08117E13 for ; Thu, 9 Apr 2015 14:59:44 +0000 (UTC) Received: (qmail 43551 invoked by uid 500); 9 Apr 2015 14:59:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 43518 invoked by uid 500); 9 Apr 2015 14:59:44 -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 43509 invoked by uid 99); 9 Apr 2015 14:59:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 14:59:44 +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; Thu, 09 Apr 2015 14:59:20 +0000 Received: (qmail 42618 invoked by uid 99); 9 Apr 2015 14:59:18 -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, 09 Apr 2015 14:59:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3A9DDFF9A; Thu, 9 Apr 2015 14:59:17 +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, 09 Apr 2015 14:59:26 -0000 Message-Id: <6caeaab32faa4561827495ddc237a0c5@git.apache.org> In-Reply-To: <650a986743b045b79ba265449483bfa8@git.apache.org> References: <650a986743b045b79ba265449483bfa8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-694 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-694 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5042e3b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5042e3b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5042e3b7 Branch: refs/heads/ignite-673 Commit: 5042e3b7bcc1498992e536a8c6f0e7b21c5bbb0a Parents: 93948ff cbab850 Author: sboikov Authored: Wed Apr 8 09:21:38 2015 +0300 Committer: sboikov Committed: Wed Apr 8 09:21:38 2015 +0300 ---------------------------------------------------------------------- .../dht/GridClientPartitionTopology.java | 6 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 49 +++++---- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +++- .../communication/tcp/TcpCommunicationSpi.java | 14 +-- .../discovery/tcp/TcpClientDiscoverySpi.java | 47 ++++---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 78 ++++++------- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +- .../resources/META-INF/classnames.properties | 19 ++-- .../cache/IgniteDynamicCacheStartSelfTest.java | 23 ++++ ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 ++----------------- .../GridAbstractCommunicationSelfTest.java | 3 +- .../GridTcpCommunicationSpiAbstractTest.java | 5 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 3 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 3 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- parent/pom.xml | 2 +- pom.xml | 1 + 23 files changed, 198 insertions(+), 227 deletions(-) ----------------------------------------------------------------------