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 9B6BD17573 for ; Wed, 24 Jun 2015 11:56:38 +0000 (UTC) Received: (qmail 69237 invoked by uid 500); 24 Jun 2015 11:56:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 69205 invoked by uid 500); 24 Jun 2015 11:56:38 -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 69196 invoked by uid 99); 24 Jun 2015 11:56:38 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jun 2015 11:56:38 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 212581A6000 for ; Wed, 24 Jun 2015 11:56:38 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id lmhhDTdRQKZ8 for ; Wed, 24 Jun 2015 11:56:28 +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 5DB1E4C0DE for ; Wed, 24 Jun 2015 11:56:28 +0000 (UTC) Received: (qmail 68594 invoked by uid 99); 24 Jun 2015 11:56:27 -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, 24 Jun 2015 11:56:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 593A0E364D; Wed, 24 Jun 2015 11:56:27 +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: Wed, 24 Jun 2015 11:56:32 -0000 Message-Id: In-Reply-To: <02d2c6449ba64b23a556981f8c8afef6@git.apache.org> References: <02d2c6449ba64b23a556981f8c8afef6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/50] incubator-ignite git commit: Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-973 Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-973 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bcfbb923 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bcfbb923 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bcfbb923 Branch: refs/heads/ignite-648 Commit: bcfbb9236e860115dfc70da9f717aaba7cb9544c Parents: 23512df d699faa Author: S.Vladykin Authored: Fri Jun 19 13:31:39 2015 +0300 Committer: S.Vladykin Committed: Fri Jun 19 13:31:39 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 42 +++++++++---------- .../ignite/spi/discovery/tcp/ServerImpl.java | 35 ++++++++++++---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 +++++++++++++------ .../tcp/internal/TcpDiscoveryNode.java | 18 ++++++++ .../core/src/main/resources/ignite.properties | 2 +- .../apache/ignite/internal/GridSelfTest.java | 20 +++++---- .../DataStreamerMultiThreadedSelfTest.java | 3 ++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 ++++++++++++++++++-- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 44 files changed, 189 insertions(+), 89 deletions(-) ----------------------------------------------------------------------