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 048B217B29 for ; Tue, 28 Apr 2015 00:42:16 +0000 (UTC) Received: (qmail 32756 invoked by uid 500); 28 Apr 2015 00:42:16 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 32726 invoked by uid 500); 28 Apr 2015 00:42:15 -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 32717 invoked by uid 99); 28 Apr 2015 00:42:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 00:42:15 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 00:41:49 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 7663A28065 for ; Tue, 28 Apr 2015 00:41:45 +0000 (UTC) Received: (qmail 30796 invoked by uid 99); 28 Apr 2015 00:41: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; Tue, 28 Apr 2015 00:41:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 45FE5E17E7; Tue, 28 Apr 2015 00:41:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 28 Apr 2015 00:41:53 -0000 Message-Id: <34c9f520804c4a709eab64e61510b92a@git.apache.org> In-Reply-To: <328a395661384246a5102c87fbe6bc82@git.apache.org> References: <328a395661384246a5102c87fbe6bc82@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/13] incubator-ignite git commit: Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a0030450 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a0030450 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a0030450 Branch: refs/heads/ignite-gg-9830 Commit: a00304508935b474e3740c1f0f7dbb9af1ca0287 Parents: b80d41b bd3a572 Author: AKuznetsov Authored: Tue Apr 28 07:02:42 2015 +0700 Committer: AKuznetsov Committed: Tue Apr 28 07:02:42 2015 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/Ignition.java | 44 ++++ .../org/apache/ignite/internal/IgnitionEx.java | 165 +++++++++++++- .../processors/cache/CacheInvokeResult.java | 24 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheReturn.java | 5 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../local/atomic/GridLocalAtomicCache.java | 6 +- .../util/spring/IgniteSpringHelper.java | 54 ++++- .../DataStreamerMultiThreadedSelfTest.java | 19 +- .../GridSwapSpaceSpiAbstractSelfTest.java | 2 +- .../query/h2/sql/BaseH2CompareQueryTest.java | 32 +-- .../util/spring/IgniteSpringHelperImpl.java | 217 +++++++++++++++---- .../IgniteStartFromStreamConfigurationTest.java | 50 +++++ .../testsuites/IgniteSpringTestSuite.java | 2 + 15 files changed, 548 insertions(+), 81 deletions(-) ----------------------------------------------------------------------