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 6CF1418590 for ; Thu, 16 Jul 2015 09:28:50 +0000 (UTC) Received: (qmail 5072 invoked by uid 500); 16 Jul 2015 09:28:50 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 5007 invoked by uid 500); 16 Jul 2015 09:28:50 -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 4991 invoked by uid 99); 16 Jul 2015 09:28:50 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jul 2015 09:28:50 +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 C59EC181A37 for ; Thu, 16 Jul 2015 09:28:49 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 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, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-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 HHWjm8TqM606 for ; Thu, 16 Jul 2015 09:28:49 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id B0E612C6C7 for ; Thu, 16 Jul 2015 09:28:25 +0000 (UTC) Received: (qmail 3244 invoked by uid 99); 16 Jul 2015 09:28:25 -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, 16 Jul 2015 09:28:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6848DE3A9D; Thu, 16 Jul 2015 09:28:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 16 Jul 2015 09:29:11 -0000 Message-Id: In-Reply-To: <677bb3be7da44ff191c0583d0646d3ed@git.apache.org> References: <677bb3be7da44ff191c0583d0646d3ed@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [48/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-1.3' into ignite-1.3_ Merge remote-tracking branch 'origin/ignite-1.3' into ignite-1.3_ Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c559692d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c559692d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c559692d Branch: refs/heads/ignite-gg-9615 Commit: c559692d6b3aa96316dc0c9b2874c67179489a87 Parents: 10c8a71 24f8961 Author: Yakov Zhdanov Authored: Tue Jul 14 16:41:51 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Jul 14 16:41:51 2015 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridDhtAtomicCache.java | 4 ++-- .../dht/atomic/GridNearAtomicUpdateFuture.java | 20 +++++++++++++++----- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- ...acheAtomicReplicatedNodeRestartSelfTest.java | 15 --------------- 4 files changed, 18 insertions(+), 23 deletions(-) ----------------------------------------------------------------------