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 19B6917F29 for ; Wed, 22 Apr 2015 16:03:13 +0000 (UTC) Received: (qmail 45496 invoked by uid 500); 22 Apr 2015 16:03:06 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 45459 invoked by uid 500); 22 Apr 2015 16:03:06 -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 45446 invoked by uid 99); 22 Apr 2015 16:03:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 16:03:06 +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: domain of root@apache.org designates 54.191.145.13 as permitted sender) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 16:03:02 +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 856A725F9B for ; Wed, 22 Apr 2015 16:02:18 +0000 (UTC) Received: (qmail 43522 invoked by uid 99); 22 Apr 2015 16:02:18 -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; Wed, 22 Apr 2015 16:02:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 63FEFE024E; Wed, 22 Apr 2015 16:02:18 +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: Wed, 22 Apr 2015 16:02:47 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [31/45] incubator-ignite git commit: Merge branches 'ignite-sprint-3-p1' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-sprint-3-p1' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6a70e76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6a70e76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6a70e76 Branch: refs/heads/ignite-gg-10115 Commit: c6a70e76e2403045d87d4452fe89a0e17e8b7a8f Parents: dc455be 82ea2cf Author: AKuznetsov Authored: Wed Apr 22 09:39:02 2015 +0700 Committer: AKuznetsov Committed: Wed Apr 22 09:39:02 2015 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/cache/CacheInterceptor.java | 9 ++++++--- .../org/apache/ignite/internal/MarshallerContextImpl.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) ----------------------------------------------------------------------