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 AE29917499 for ; Thu, 16 Apr 2015 17:37:24 +0000 (UTC) Received: (qmail 59049 invoked by uid 500); 16 Apr 2015 17:37:24 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 59020 invoked by uid 500); 16 Apr 2015 17:37:24 -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 59010 invoked by uid 99); 16 Apr 2015 17:37:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2015 17:37:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 16 Apr 2015 17:36:56 +0000 Received: (qmail 55865 invoked by uid 99); 16 Apr 2015 17:36:52 -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 Apr 2015 17:36:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B6070E10AB; Thu, 16 Apr 2015 17:36:52 +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: Thu, 16 Apr 2015 17:37:13 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [23/39] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-738 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-738 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67978717 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67978717 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67978717 Branch: refs/heads/ignite-485 Commit: 679787172e7967c21231cd10d970bdd4188c0552 Parents: 87d2814 59b11b4 Author: ivasilinets Authored: Mon Apr 13 20:47:39 2015 +0300 Committer: ivasilinets Committed: Mon Apr 13 20:47:39 2015 +0300 ---------------------------------------------------------------------- .../distributed/near/GridNearCacheEntry.java | 10 ++- .../CacheQueryCloseableScanBiPredicate.java | 30 +++++++++ .../cache/query/GridCacheQueryManager.java | 8 ++- .../util/future/GridCompoundFuture.java | 9 +-- .../cache/GridCachePutAllFailoverSelfTest.java | 12 +++- ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 32 ++++++++++ ...GridCachePartitionedNodeRestartSelfTest.java | 67 -------------------- .../GridCacheAbstractNodeRestartSelfTest.java | 23 ++++--- .../IgniteCacheAtomicNodeRestartTest.java | 33 ++++++++++ .../GridCachePartitionedNodeRestartTest.java | 1 + .../GridCachePartitionedTxSalvageSelfTest.java | 4 ++ .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + ...acheAtomicReplicatedNodeRestartSelfTest.java | 32 ++++++++++ .../testsuites/IgniteCacheRestartTestSuite.java | 20 +++--- 14 files changed, 190 insertions(+), 93 deletions(-) ----------------------------------------------------------------------