Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 07943200AF8 for ; Thu, 5 May 2016 11:11:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0629C160A04; Thu, 5 May 2016 09:11:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7539D160A02 for ; Thu, 5 May 2016 11:11:00 +0200 (CEST) Received: (qmail 5926 invoked by uid 500); 5 May 2016 09:10:59 -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 5916 invoked by uid 99); 5 May 2016 09:10: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, 05 May 2016 09:10:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1366ADF9C4; Thu, 5 May 2016 09:10:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmagda@apache.org To: commits@ignite.apache.org Date: Thu, 05 May 2016 09:10:59 -0000 Message-Id: <7efa428efa3d4535a20ab34fc350a79a@git.apache.org> In-Reply-To: <7db8898c11014eb8ae117a4cb03ed033@git.apache.org> References: <7db8898c11014eb8ae117a4cb03ed033@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite archived-at: Thu, 05 May 2016 09:11:01 -0000 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a3566b87 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a3566b87 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a3566b87 Branch: refs/heads/master Commit: a3566b87b206806e8a8f4d260ef808aaf506ff32 Parents: 12d1d4f 65183c3 Author: Denis Magda Authored: Thu May 5 12:02:35 2016 +0300 Committer: Denis Magda Committed: Thu May 5 12:02:35 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/MarshallerContextImpl.java | 24 ++++++++--------- .../processors/cache/GridCachePreloader.java | 5 ---- .../cache/GridCachePreloaderAdapter.java | 5 ---- .../processors/cache/GridCacheProcessor.java | 22 ++++------------ .../dht/preloader/GridDhtPreloader.java | 27 -------------------- 5 files changed, 15 insertions(+), 68 deletions(-) ----------------------------------------------------------------------