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 705CE100FB for ; Tue, 8 Sep 2015 16:34:45 +0000 (UTC) Received: (qmail 18220 invoked by uid 500); 8 Sep 2015 16:34:40 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 18148 invoked by uid 500); 8 Sep 2015 16:34:40 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 18131 invoked by uid 99); 8 Sep 2015 16:34:40 -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, 08 Sep 2015 16:34:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2A2AADFA96; Tue, 8 Sep 2015 16:34:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Tue, 08 Sep 2015 16:34:41 -0000 Message-Id: <0734eca84ca5431586cc8e9e46487edb@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ignite git commit: Merge remote-tracking branch 'apache/ignite-1.4' into ignite-1.4 Merge remote-tracking branch 'apache/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e4e39af6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e4e39af6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e4e39af6 Branch: refs/heads/ignite-1.4 Commit: e4e39af68d1546b99d2ffe367ca1f3ba840db501 Parents: 108dd8f b8db248 Author: ashutak Authored: Tue Sep 8 19:34:08 2015 +0300 Committer: ashutak Committed: Tue Sep 8 19:34:08 2015 +0300 ---------------------------------------------------------------------- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +- .../cache/GridCacheMvccCandidate.java | 2 +- .../processors/igfs/IgfsDataManager.java | 14 ++-- .../ignite/GridSuppressedExceptionSelfTest.java | 22 ------- ...cheAbstractFullApiMultithreadedSelfTest.java | 69 ++++++++++++-------- ...dCacheQueueMultiNodeConsistencySelfTest.java | 58 +++++++++------- .../GridCacheSetFailoverAbstractSelfTest.java | 2 - ...PartitionedFullApiMultithreadedSelfTest.java | 5 -- ...eReplicatedFullApiMultithreadedSelfTest.java | 5 -- ...dCacheLocalFullApiMultithreadedSelfTest.java | 5 -- .../unsafe/GridUnsafeMemoryPerformanceTest.java | 65 ++++++++++++++++++ .../unsafe/GridUnsafeMemorySelfTest.java | 38 ----------- .../h2/GridIndexingSpiAbstractSelfTest.java | 13 ---- 13 files changed, 150 insertions(+), 150 deletions(-) ----------------------------------------------------------------------