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 66F101742F for ; Wed, 1 Apr 2015 10:26:36 +0000 (UTC) Received: (qmail 78141 invoked by uid 500); 1 Apr 2015 10:26:36 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 78096 invoked by uid 500); 1 Apr 2015 10:26:36 -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 78082 invoked by uid 99); 1 Apr 2015 10:26:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2015 10:26:36 +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; Wed, 01 Apr 2015 10:26:13 +0000 Received: (qmail 77797 invoked by uid 99); 1 Apr 2015 10:26:11 -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, 01 Apr 2015 10:26:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 141FCE2F25; Wed, 1 Apr 2015 10:26:11 +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, 01 Apr 2015 10:26:23 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/14] incubator-ignite git commit: Merge remote-tracking branches 'remotes/origin/ignite-291' and 'remotes/origin/ignite-615-616' into ignite-sprint-3 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branches 'remotes/origin/ignite-291' and 'remotes/origin/ignite-615-616' 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/b05b06f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b05b06f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b05b06f9 Branch: refs/heads/ignite-sprint-3 Commit: b05b06f91ec71145656f26b6d0f334ff9ed503d6 Parents: 091369c 94652c6 22d5915 Author: avinogradov Authored: Wed Apr 1 13:24:45 2015 +0300 Committer: avinogradov Committed: Wed Apr 1 13:24:45 2015 +0300 ---------------------------------------------------------------------- .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 9 +- .../apache/ignite/internal/IgniteKernal.java | 5 +- .../cache/DynamicCacheDescriptor.java | 2 +- .../processors/cache/GridCacheAdapter.java | 4 +- .../processors/cache/GridCacheProcessor.java | 66 +++++------ .../processors/igfs/IgfsHelperImpl.java | 3 +- .../ignite/startup/BasicWarmupClosure.java | 2 +- ...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 52 +++++++++ ...IgniteCacheStoreNodeRestartAbstractTest.java | 116 +++++++++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../hibernate/CacheHibernateBlobStore.java | 9 +- .../CacheHibernateBlobStoreNodeRestartTest.java | 52 +++++++++ .../testsuites/IgniteHibernateTestSuite.java | 2 + .../processors/query/h2/IgniteH2Indexing.java | 4 +- 15 files changed, 281 insertions(+), 49 deletions(-) ----------------------------------------------------------------------