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 08A5718B61 for ; Thu, 2 Jul 2015 11:08:29 +0000 (UTC) Received: (qmail 80089 invoked by uid 500); 2 Jul 2015 11:08:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 80057 invoked by uid 500); 2 Jul 2015 11:08:28 -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 80048 invoked by uid 99); 2 Jul 2015 11:08:28 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jul 2015 11:08:28 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 5E8D6D1A2A for ; Thu, 2 Jul 2015 11:08:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.21 X-Spam-Level: * X-Spam-Status: No, score=1.21 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.571, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 3-U8h5m3aHpP for ; Thu, 2 Jul 2015 11:08:27 +0000 (UTC) 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 4D29A4C18D for ; Thu, 2 Jul 2015 11:08:16 +0000 (UTC) Received: (qmail 79565 invoked by uid 99); 2 Jul 2015 11:08:15 -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, 02 Jul 2015 11:08:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A1453E3653; Thu, 2 Jul 2015 11:08:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 02 Jul 2015 11:08:39 -0000 Message-Id: <713ded2f080d4ba88ee6b16d9d49cc81@git.apache.org> In-Reply-To: <73dc9ad3db6646e99bc4991d38153e3a@git.apache.org> References: <73dc9ad3db6646e99bc4991d38153e3a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/26] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-1067 Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-1067 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea3525ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea3525ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea3525ea Branch: refs/heads/ignite-1067 Commit: ea3525ea6c06f3b3b876ed78febded4fda2e5134 Parents: d268375 b437ec7 Author: Anton Authored: Thu Jul 2 13:39:14 2015 +0300 Committer: Anton Committed: Thu Jul 2 13:39:14 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 1 - .../managers/communication/GridIoManager.java | 124 +++++++++++++++---- .../managers/communication/GridIoMessage.java | 15 ++- .../managers/communication/GridIoPolicy.java | 32 ++--- .../eventstorage/GridEventStorageManager.java | 2 +- .../internal/processors/cache/CacheType.java | 8 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheIoManager.java | 12 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java | 9 +- .../GridDistributedTxRemoteAdapter.java | 3 +- .../distributed/dht/GridDhtTxFinishRequest.java | 3 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../cache/distributed/dht/GridDhtTxRemote.java | 5 +- .../near/GridNearTxFinishRequest.java | 3 +- .../cache/distributed/near/GridNearTxLocal.java | 3 +- .../distributed/near/GridNearTxRemote.java | 5 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 11 +- .../transactions/IgniteTxLocalAdapter.java | 3 +- .../internal/processors/igfs/IgfsContext.java | 5 +- .../plugin/IgnitePluginProcessor.java | 3 +- .../plugin/extensions/communication/IoPool.java | 42 +++++++ .../ignite/spi/discovery/tcp/ClientImpl.java | 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 5 +- .../TcpDiscoveryMulticastIpFinder.java | 2 +- .../communication/GridIoManagerSelfTest.java | 2 +- .../cache/IgniteInternalCacheTypesTest.java | 3 +- .../extdata/uri/modules/uri-dependency/pom.xml | 32 ++--- .../deployment/uri/tasks/gar-spring-bean.xml | 30 ++--- modules/urideploy/pom.xml | 14 --- 32 files changed, 240 insertions(+), 166 deletions(-) ----------------------------------------------------------------------