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 C5079188D8 for ; Thu, 23 Jul 2015 13:51:09 +0000 (UTC) Received: (qmail 28778 invoked by uid 500); 23 Jul 2015 13:51:06 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 28748 invoked by uid 500); 23 Jul 2015 13:51:06 -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 28739 invoked by uid 99); 23 Jul 2015 13:51:06 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2015 13:51:06 +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 22717D7045 for ; Thu, 23 Jul 2015 13:51:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.554 X-Spam-Level: X-Spam-Status: No, score=0.554 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=-1.227, 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 c5rY_-9XlF-U for ; Thu, 23 Jul 2015 13:51:00 +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 6B6DA50612 for ; Thu, 23 Jul 2015 13:51:00 +0000 (UTC) Received: (qmail 27699 invoked by uid 99); 23 Jul 2015 13:50:59 -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, 23 Jul 2015 13:50:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95072E6814; Thu, 23 Jul 2015 13:50:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ivasilinets@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 23 Jul 2015 13:51:00 -0000 Message-Id: <8ef740a4a0c44ed2a2ddf93df78acced@git.apache.org> In-Reply-To: <11d4c5012af3494ebb9981b8e2b707e5@git.apache.org> References: <11d4c5012af3494ebb9981b8e2b707e5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/27] incubator-ignite git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/63575bb8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63575bb8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/63575bb8 Branch: refs/heads/ignite-961 Commit: 63575bb8bb3a892f64b5062c5a608f6b8bc538d3 Parents: f8a1317 fa21d8c Author: Denis Magda Authored: Tue Jul 21 14:36:08 2015 +0300 Committer: Denis Magda Committed: Tue Jul 21 14:36:08 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../AffinityNodeAddressHashResolver.java | 8 +- .../affinity/AffinityNodeHashResolver.java | 5 + .../affinity/AffinityNodeIdHashResolver.java | 6 + .../rendezvous/RendezvousAffinityFunction.java | 22 +++- .../configuration/CacheConfiguration.java | 4 +- .../configuration/IgniteConfiguration.java | 26 +++++ .../apache/ignite/internal/IgniteKernal.java | 3 + .../ignite/internal/IgniteNodeAttributes.java | 3 + .../processors/cache/GridCacheAttributes.java | 8 +- .../processors/cache/GridCacheProcessor.java | 113 ++++++++++++------- .../processors/cache/IgniteInternalCache.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 21 +++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../tcp/internal/TcpDiscoveryNode.java | 18 ++- ...DiscoveryNodeConfigConsistentIdSelfTest.java | 76 +++++++++++++ .../IgniteSpiDiscoverySelfTestSuite.java | 1 + 17 files changed, 260 insertions(+), 63 deletions(-) ----------------------------------------------------------------------