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 460E61840E for ; Tue, 24 Nov 2015 11:42:22 +0000 (UTC) Received: (qmail 39536 invoked by uid 500); 24 Nov 2015 11:42:22 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 39439 invoked by uid 500); 24 Nov 2015 11:42:22 -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 38671 invoked by uid 99); 24 Nov 2015 11:42:21 -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, 24 Nov 2015 11:42:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D1DF1E0D55; Tue, 24 Nov 2015 11:42:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Tue, 24 Nov 2015 11:42:44 -0000 Message-Id: <438a2b6c96d34e3d80dffbfdbb0224de@git.apache.org> In-Reply-To: <90e70f98918f481193d67804998872fc@git.apache.org> References: <90e70f98918f481193d67804998872fc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/25] ignite git commit: Merge branch 'ignite-1282' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1282 Merge branch 'ignite-1282' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1282 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/76803923 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/76803923 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/76803923 Branch: refs/heads/ignite-1282 Commit: 76803923dda7fb346e273aca5079352532b586dd Parents: 4844b3e b751843 Author: Alexey Goncharuk Authored: Tue Nov 24 14:41:22 2015 +0300 Committer: Alexey Goncharuk Committed: Tue Nov 24 14:41:22 2015 +0300 ---------------------------------------------------------------------- .../scalar/examples/ScalarCacheExample.scala | 19 +++++++++++++++---- .../test/resources/spring-ping-pong-partner.xml | 18 ------------------ 2 files changed, 15 insertions(+), 22 deletions(-) ----------------------------------------------------------------------