Merge branches 'ignite-45' and 'sprint-2' 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/GridCacheAffinityManager.java
modules/core/src/main/resources/META-INF/classnames.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/317e4bb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/317e4bb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/317e4bb5
Branch: refs/heads/ignite-45
Commit: 317e4bb5d8b869d07b0e7aa588f32068a380fd4b
Parents: ea5231b 1356a20
Author: Yakov Zhdanov <yzhda...@gridgain.com>
Authored: Fri Mar 20 12:45:52 2015 +0300
Committer: Yakov Zhdanov <yzhda...@gridgain.com>
Committed: Fri Mar 20 12:45:52 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../deployment/GridDeploymentLocalStore.java | 5 +-
.../GridDeploymentPerLoaderStore.java | 5 +-
.../GridDeploymentPerVersionStore.java | 5 +-
.../discovery/GridDiscoveryManager.java | 1 +
.../cache/GridCacheAffinityManager.java | 47 ---------
.../processors/cache/GridPartitionLockKey.java | 104 -------------------
.../preloader/GridDhtPartitionSupplyPool.java | 2 +-
.../optimized/OptimizedClassDescriptor.java | 20 +++-
.../optimized/OptimizedMarshaller.java | 30 +++---
.../optimized/OptimizedMarshallerUtils.java | 50 +++------
.../optimized/OptimizedObjectInputStream.java | 20 +++-
.../optimized/OptimizedObjectOutputStream.java | 22 +++-
.../internal/ClusterNodeMetricsSelfTest.java | 31 +++++-
.../processors/service/DummyService.java | 4 +
.../optimized/OptimizedMarshallerTest.java | 4 +-
.../OptimizedObjectStreamSelfTest.java | 8 +-
.../testframework/junits/GridAbstractTest.java | 2 +-
.../org/apache/ignite/schema/ui/Controls.java | 42 +++-----
.../ignite/schema/ui/SchemaImportApp.java | 14 ++-
.../commands/cache/VisorCacheCommand.scala | 4 +-
21 files changed, 166 insertions(+), 256 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/317e4bb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/317e4bb5/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/317e4bb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/317e4bb5/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/317e4bb5/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
