Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-239
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5830deb2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5830deb2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5830deb2 Branch: refs/heads/ignite-237 Commit: 5830deb20bf02705cb82203db074dfc2bb01473d Parents: 3942853 4e7463d Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Feb 27 16:04:40 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Feb 27 16:04:40 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/IgniteFs.java | 2 +- .../ignite/events/DiscoveryCustomEvent.java | 56 -------- .../org/apache/ignite/events/EventType.java | 14 +- .../java/org/apache/ignite/igfs/package.html | 2 +- .../internal/events/DiscoveryCustomEvent.java | 68 +++++++++ .../discovery/GridDiscoveryManager.java | 7 +- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../visor/node/VisorBasicConfiguration.java | 17 --- .../node/VisorNodeEventsCollectorTask.java | 10 +- .../internal/visor/node/VisorNodeGcTask.java | 10 +- .../internal/visor/node/VisorNodePingTask.java | 10 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +- .../internal/GridDiscoveryEventSelfTest.java | 9 +- ...dStartupWithUndefinedIgniteHomeSelfTest.java | 103 ++++++++++++++ .../testsuites/IgniteKernalSelfTestSuite.java | 1 + .../java/org/apache/ignite/igfs/package.html | 2 +- .../testsuites/IgniteHadoopTestSuite.java | 7 +- .../commands/alert/VisorAlertCommand.scala | 8 +- .../commands/cache/VisorCacheCommand.scala | 82 +++++++---- .../config/VisorConfigurationCommand.scala | 140 ++++++++++--------- .../commands/disco/VisorDiscoveryCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 64 ++++++--- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- 23 files changed, 392 insertions(+), 243 deletions(-) ----------------------------------------------------------------------