Merge branch 'ignite-sprint-3' of 
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e0d88d3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e0d88d3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e0d88d3a

Branch: refs/heads/ignite-30
Commit: e0d88d3a0dc0f07316d9f48910203a8dd1428346
Parents: d9e2a64 0cf79e4
Author: S.Vladykin <svlady...@gridgain.com>
Authored: Wed Apr 8 13:12:36 2015 +0300
Committer: S.Vladykin <svlady...@gridgain.com>
Committed: Wed Apr 8 13:12:36 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/GridCacheIoManager.java    |   2 +-
 .../processors/cache/GridCacheProcessor.java    | 349 +++++++++++++++---
 .../dht/GridClientPartitionTopology.java        |   6 +-
 .../distributed/dht/GridDhtLockFuture.java      |  10 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   6 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  49 +--
 .../distributed/dht/GridDhtTxPrepareFuture.java |   2 +-
 .../GridDhtPartitionsExchangeFuture.java        |   1 +
 .../cache/transactions/IgniteTxManager.java     |   6 +-
 .../resources/META-INF/classnames.properties    |  19 +-
 ...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++
 .../IgniteCacheConfigurationTemplateTest.java   | 364 +++++++++++++++++++
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  23 ++
 .../ignite/testframework/junits/IgniteMock.java |  10 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   5 +-
 .../org/apache/ignite/IgniteSpringBean.java     |  14 +
 .../commands/cache/VisorCacheClearCommand.scala |   3 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  12 +-
 23 files changed, 1011 insertions(+), 104 deletions(-)
----------------------------------------------------------------------


Reply via email to