Merge branch 'ignite-45' into ignite-541
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a910540 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a910540 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a910540 Branch: refs/heads/ignite-45 Commit: 1a9105400c904cf00ed024b3241ebaecf146e899 Parents: d7c3d0a 4e4feb8 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Mar 20 17:12:47 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Mar 20 17:12:47 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 20 ++- .../configuration/NearCacheConfiguration.java | 23 ---- .../apache/ignite/internal/IgniteKernal.java | 60 ++++++--- .../processors/cache/GridCacheProcessor.java | 51 ++++---- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 2 +- .../GridProjectionForCachesSelfTest.java | 15 +-- .../discovery/GridDiscoveryManagerSelfTest.java | 8 +- .../cache/GridCacheClearLocallySelfTest.java | 6 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 125 +++++++++++-------- .../GridCacheClientModesAbstractSelfTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 8 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 12 +- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 12 +- .../org/apache/ignite/IgniteSpringBean.java | 18 ++- 16 files changed, 208 insertions(+), 158 deletions(-) ----------------------------------------------------------------------
