Merge branches 'ignite-45' and 'ignite-541' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/87a941a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/87a941a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/87a941a3
Branch: refs/heads/ignite-45
Commit: 87a941a3bd412307e3e10af18fc4ea5d38f7d27d
Parents: 95537b5 1229c7f
Author: Valentin Kulichenko <[email protected]>
Authored: Fri Mar 20 21:08:06 2015 -0700
Committer: Valentin Kulichenko <[email protected]>
Committed: Fri Mar 20 21:08:06 2015 -0700
----------------------------------------------------------------------
.../cache/DynamicCacheChangeRequest.java | 14 +-
.../processors/cache/GridCacheProcessor.java | 68 ++--
.../GridDhtPartitionsExchangeFuture.java | 8 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 80 ++++-
.../apache/ignite/cache/spring/SpringCache.java | 142 ++------
.../ignite/cache/spring/SpringCacheManager.java | 103 ++++--
.../cache/spring/SpringDynamicCacheManager.java | 339 -------------------
.../spring/GridSpringCacheManagerSelfTest.java | 107 +++++-
.../GridSpringDynamicCacheManagerSelfTest.java | 219 ------------
.../GridSpringDynamicCacheTestService.java | 34 +-
.../org/apache/ignite/spring/spring-caching.xml | 10 +
.../ignite/spring/spring-dynamic-caching.xml | 43 ---
.../testsuites/IgniteSpringTestSuite.java | 1 -
13 files changed, 377 insertions(+), 791 deletions(-)
----------------------------------------------------------------------
