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 8C6AF18A8A for ; Tue, 28 Apr 2015 11:17:11 +0000 (UTC) Received: (qmail 29188 invoked by uid 500); 28 Apr 2015 11:17:11 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 29157 invoked by uid 500); 28 Apr 2015 11:17:11 -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 29111 invoked by uid 99); 28 Apr 2015 11:17:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 11:17:11 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 11:17:06 +0000 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 C223324CE5 for ; Tue, 28 Apr 2015 11:16:46 +0000 (UTC) Received: (qmail 28720 invoked by uid 99); 28 Apr 2015 11:16:46 -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; Tue, 28 Apr 2015 11:16:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 82D54DFBC6; Tue, 28 Apr 2015 11:16:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 28 Apr 2015 11:16:47 -0000 Message-Id: In-Reply-To: <34877dcfb1664bf4b132effd9353f8b3@git.apache.org> References: <34877dcfb1664bf4b132effd9353f8b3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-776' into ignite-776 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'origin/ignite-776' into ignite-776 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5dc5a6a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5dc5a6a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5dc5a6a6 Branch: refs/heads/ignite-776 Commit: 5dc5a6a699f254cc7f61acf29f8d903d664457f9 Parents: 7c5a04b 5fbdd40 Author: Andrey Authored: Tue Apr 28 18:16:32 2015 +0700 Committer: Andrey Committed: Tue Apr 28 18:16:32 2015 +0700 ---------------------------------------------------------------------- .../processors/cache/CacheInvokeResult.java | 24 ++++++++++++++--- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 4 +-- .../processors/cache/GridCacheReturn.java | 5 ++-- .../dht/atomic/GridDhtAtomicCache.java | 3 +-- .../local/atomic/GridLocalAtomicCache.java | 6 ++--- .../ignite/GridSuppressedExceptionSelfTest.java | 4 +-- .../processors/cache/GridCacheOffHeapTest.java | 28 +++++--------------- ...ePartitionedNearDisabledMetricsSelfTest.java | 4 +-- .../GridCacheEvictionFilterSelfTest.java | 4 +-- .../IgniteCacheExpiryPolicyAbstractTest.java | 10 +++---- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +-- .../DataStreamerMultiThreadedSelfTest.java | 19 +++++++++---- .../processors/igfs/IgfsModesSelfTest.java | 4 +-- .../unsafe/GridUnsafeMemorySelfTest.java | 4 +-- .../GridSwapSpaceSpiAbstractSelfTest.java | 2 +- .../apache/ignite/util/GridRandomSelfTest.java | 4 +-- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 4 +-- .../collections/HadoopHashMapSelfTest.java | 4 +-- .../cache/GridCacheCrossCacheQuerySelfTest.java | 8 ++---- .../h2/GridIndexingSpiAbstractSelfTest.java | 4 +-- .../query/h2/sql/BaseH2CompareQueryTest.java | 4 +-- 22 files changed, 69 insertions(+), 86 deletions(-) ----------------------------------------------------------------------