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 ECE67173A1 for ; Wed, 27 May 2015 16:13:47 +0000 (UTC) Received: (qmail 84189 invoked by uid 500); 27 May 2015 16:13:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 84160 invoked by uid 500); 27 May 2015 16:13: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 84151 invoked by uid 99); 27 May 2015 16:13:44 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 May 2015 16:13:44 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 4F62B1822A3 for ; Wed, 27 May 2015 16:13:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.229 X-Spam-Level: X-Spam-Status: No, score=-3.229 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id luQZnKa_sQph for ; Wed, 27 May 2015 16:13:42 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id E54DD2D651 for ; Wed, 27 May 2015 16:13:26 +0000 (UTC) Received: (qmail 79727 invoked by uid 99); 27 May 2015 16:13:20 -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; Wed, 27 May 2015 16:13:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9C3C5E050C; Wed, 27 May 2015 16:13:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 27 May 2015 16:13:35 -0000 Message-Id: <8977984a88294c828eba0458698ce111@git.apache.org> In-Reply-To: <522f61f41f694ce0a455e8c937becb2c@git.apache.org> References: <522f61f41f694ce0a455e8c937becb2c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23 Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ff17cafa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ff17cafa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ff17cafa Branch: refs/heads/ignite-943 Commit: ff17cafa834bc2c8cf26618d716a53ec4fb3a352 Parents: 7ec45f9 9480e8d Author: sboikov Authored: Mon May 25 09:10:45 2015 +0300 Committer: sboikov Committed: Mon May 25 09:10:45 2015 +0300 ---------------------------------------------------------------------- .../discovery/CustomMessageWrapper.java | 5 ++ .../discovery/DiscoveryCustomMessage.java | 5 ++ .../discovery/GridDiscoveryManager.java | 26 +++++----- .../cache/DynamicCacheChangeBatch.java | 5 ++ .../continuous/AbstractContinuousMessage.java | 54 ++++++++++++++++++++ .../StartRoutineAckDiscoveryMessage.java | 26 ++++------ .../StartRoutineDiscoveryMessage.java | 27 ++++------ .../StopRoutineAckDiscoveryMessage.java | 21 +++----- .../continuous/StopRoutineDiscoveryMessage.java | 23 +++------ .../discovery/DiscoverySpiCustomMessage.java | 5 ++ .../discovery/tcp/TcpClientDiscoverySpi.java | 8 ++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 14 ++--- .../TcpDiscoveryCustomEventMessage.java | 31 +++++++++-- .../GridDiscoveryManagerAliveCacheSelfTest.java | 41 +++++++++------ .../continuous/GridEventConsumeSelfTest.java | 2 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 36 +++++++++---- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 3 +- 17 files changed, 214 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff17cafa/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff17cafa/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java ----------------------------------------------------------------------