Merge branch 'ignite-49' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-49
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b81573f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b81573f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b81573f6 Branch: refs/heads/ignite-102 Commit: b81573f6e608bdf23b2ffbf27e0784a0d1ad5558 Parents: 7c89e31 b8c1bcf Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Jan 27 11:45:52 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Jan 27 11:45:52 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteNotPeerDeployable.java | 41 -- .../org/apache/ignite/cache/CacheManager.java | 2 +- .../org/apache/ignite/cache/CacheMetrics.java | 4 +- .../org/apache/ignite/internal/GridKernal.java | 1 + .../discovery/GridDiscoveryManager.java | 2 +- .../ignite/lang/IgniteNotPeerDeployable.java | 41 ++ .../ignite/mxbean/CacheMetricsMXBean.java | 7 +- .../spi/discovery/DiscoveryMetricsHelper.java | 2 +- .../spi/discovery/DiscoveryMetricsProvider.java | 2 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNode.java | 4 +- .../ignite/startup/BasicWarmupClosure.java | 561 +++++++++++++++++++ .../junits/spi/GridSpiAbstractTest.java | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- 15 files changed, 615 insertions(+), 60 deletions(-) ----------------------------------------------------------------------
