You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/08 15:17:32 UTC
[36/43] incubator-ignite git commit: Merge branches 'ignite-639' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-639
Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d44e610
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d44e610
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d44e610
Branch: refs/heads/ignite-180-1
Commit: 4d44e6106666c57870938b4c1699249c8d68beca
Parents: 36c330a fa552bc
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Apr 8 17:55:20 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Apr 8 17:55:20 2015 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 15 +
.../apache/ignite/internal/IgniteKernal.java | 37 ++
.../org/apache/ignite/internal/IgnitionEx.java | 171 ++++-----
.../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 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +-
.../communication/tcp/TcpCommunicationSpi.java | 14 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 47 ++-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 78 ++--
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +-
.../resources/META-INF/classnames.properties | 19 +-
...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++
.../IgniteCacheConfigurationTemplateTest.java | 364 +++++++++++++++++++
.../cache/IgniteDynamicCacheStartSelfTest.java | 23 ++
...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +-----
.../GridAbstractCommunicationSelfTest.java | 3 +-
.../GridTcpCommunicationSpiAbstractTest.java | 5 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 3 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 3 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +-
.../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 +-
parent/pom.xml | 2 +-
pom.xml | 1 +
39 files changed, 1192 insertions(+), 401 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d44e610/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------