Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/31180aa1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/31180aa1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/31180aa1 Branch: refs/heads/sprint-2 Commit: 31180aa1760aa2500393e5fb284c28b4289330e4 Parents: eb14f3b 9e1377f Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Feb 26 18:42:30 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Feb 26 18:42:30 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 +- .../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 +- 12 files changed, 199 insertions(+), 81 deletions(-) ----------------------------------------------------------------------
