Merge remote-tracking branch 'origin/ignite-sprint-3' 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/6413426c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6413426c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6413426c Branch: refs/heads/ignite-gg-10002 Commit: 6413426c4fe672a6f75bb89db9531bd72d761783 Parents: 39cfcbd dc62822 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Apr 1 16:26:33 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Apr 1 16:26:33 2015 +0300 ---------------------------------------------------------------------- .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 9 +- .../configuration/FileSystemConfiguration.java | 6 + .../apache/ignite/internal/IgniteKernal.java | 5 +- .../cache/DynamicCacheDescriptor.java | 2 +- .../processors/cache/GridCacheAdapter.java | 4 +- .../processors/cache/GridCacheProcessor.java | 66 +++++------ .../continuous/CacheContinuousQueryManager.java | 28 +++++ .../processors/igfs/IgfsDataManager.java | 11 +- .../processors/igfs/IgfsFileAffinityRange.java | 23 +--- .../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 +- 19 files changed, 320 insertions(+), 78 deletions(-) ----------------------------------------------------------------------
