Merge remote-tracking branch 'origin/ignite-556' into ignite-556
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e7c88098 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e7c88098 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e7c88098 Branch: refs/heads/ignite-556 Commit: e7c880981afb7640353f6ab36c477966f1c632d4 Parents: 5d5245f 0eadc45 Author: sboikov <sboi...@gridgain.com> Authored: Mon Mar 23 14:38:34 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Mar 23 14:38:34 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 56 +++++++++- .../apache/ignite/internal/IgniteKernal.java | 101 ++++++++++++++----- .../spring/IgniteSpringProcessor.java | 7 +- modules/core/src/test/config/cache.xml | 2 + ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 2 +- .../GridProjectionForCachesSelfTest.java | 2 +- .../discovery/GridDiscoveryManagerSelfTest.java | 4 +- .../cache/GridCacheClearLocallySelfTest.java | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 6 +- .../GridCacheClientModesAbstractSelfTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 8 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 31 +++++- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 4 +- .../org/apache/ignite/IgniteSpringBean.java | 45 ++++++++- .../spring/IgniteSpringProcessorImpl.java | 27 ++--- .../internal/IgniteDynamicCacheConfigTest.java | 21 +++- 18 files changed, 244 insertions(+), 80 deletions(-) ----------------------------------------------------------------------
