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-471 Commit: b05b06f91ec71145656f26b6d0f334ff9ed503d6 Parents: 091369c 94652c6 22d5915 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Apr 1 13:24:45 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> 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(-) ----------------------------------------------------------------------
