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/0cf79e46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0cf79e46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0cf79e46

Branch: refs/heads/ignite-30
Commit: 0cf79e467ab532e21ccac9ee6d36f57145c457de
Parents: 21c8e89 682dcd1
Author: vozerov-gridgain <voze...@gridgain.com>
Authored: Wed Apr 8 13:00:10 2015 +0300
Committer: vozerov-gridgain <voze...@gridgain.com>
Committed: Wed Apr 8 13:00:10 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java |  15 +
 .../apache/ignite/internal/IgniteKernal.java    |  37 ++
 .../internal/managers/GridManagerAdapter.java   |  34 +-
 .../cache/DynamicCacheChangeRequest.java        |  17 +
 .../cache/DynamicCacheDescriptor.java           |  17 +-
 .../processors/cache/GridCacheProcessor.java    | 349 +++++++++++++++---
 .../GridDhtPartitionsExchangeFuture.java        |   1 +
 ...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++
 .../IgniteCacheConfigurationTemplateTest.java   | 364 +++++++++++++++++++
 .../ignite/testframework/junits/IgniteMock.java |  10 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../org/apache/ignite/IgniteSpringBean.java     |  14 +
 12 files changed, 920 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


Reply via email to