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 B25D817994 for ; Thu, 9 Apr 2015 08:04:03 +0000 (UTC) Received: (qmail 64326 invoked by uid 500); 9 Apr 2015 08:03:05 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 64296 invoked by uid 500); 9 Apr 2015 08:03:05 -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 64273 invoked by uid 99); 9 Apr 2015 08:03:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 08:03:05 +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, 09 Apr 2015 08:03:03 +0000 Received: (qmail 64138 invoked by uid 99); 9 Apr 2015 08:02:43 -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, 09 Apr 2015 08:02:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1819BDFF72; Thu, 9 Apr 2015 08:02:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 09 Apr 2015 08:02:47 -0000 Message-Id: <2486ec15875d43f8b9ed2c46cc2889ed@git.apache.org> In-Reply-To: <509b1c15ca0b476b8bc99e701b5953ae@git.apache.org> References: <509b1c15ca0b476b8bc99e701b5953ae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/12] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f458d28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f458d28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f458d28 Branch: refs/heads/ignite-gg-9829 Commit: 2f458d28ac965da64ec6e30918bba3541cde9bc1 Parents: 7f4c5ee 7eef373 Author: Artem Shutak Authored: Wed Apr 8 18:27:39 2015 +0300 Committer: Artem Shutak Committed: Wed Apr 8 18:27:39 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/IgniteKernal.java | 11 ++++++++++- .../internal/processors/cache/GridCacheProcessor.java | 11 ++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) ----------------------------------------------------------------------