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 32B0417CE1 for ; Tue, 28 Apr 2015 17:34:06 +0000 (UTC) Received: (qmail 7870 invoked by uid 500); 28 Apr 2015 17:34:06 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 7835 invoked by uid 500); 28 Apr 2015 17:34: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 7824 invoked by uid 99); 28 Apr 2015 17:34:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 17:34: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: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 17:34:01 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 3CF1745442 for ; Tue, 28 Apr 2015 17:33:41 +0000 (UTC) Received: (qmail 7099 invoked by uid 99); 28 Apr 2015 17:33:40 -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 17:33:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A9606E08E9; Tue, 28 Apr 2015 17:33:40 +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: Tue, 28 Apr 2015 17:33:49 -0000 Message-Id: <825243a6e8e1455c893275ae31d7daf3@git.apache.org> In-Reply-To: <547c85dc754f4eb5aeb4d3ed04796d86@git.apache.org> References: <547c85dc754f4eb5aeb4d3ed04796d86@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157-2 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2229d74e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2229d74e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2229d74e Branch: refs/heads/ignite-646 Commit: 2229d74e8f3982a9fd5ab8a71e7d94b1d5e0948a Parents: 8062947 bd3a572 Author: sboikov Authored: Mon Apr 27 20:28:24 2015 +0300 Committer: sboikov Committed: Mon Apr 27 20:28:24 2015 +0300 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------