Merge branch 'sprint-2' into ignite-322
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96deb436 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96deb436 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96deb436 Branch: refs/heads/ignite-368 Commit: 96deb436833efa77eadca95753eca2a2d0817814 Parents: 5ed43d1 47539d8 Author: Artem Shutak <ashu...@gridgain.com> Authored: Fri Feb 27 12:30:52 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Fri Feb 27 12:30:52 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 +- .../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 +- 16 files changed, 219 insertions(+), 101 deletions(-) ----------------------------------------------------------------------
