Merge branches 'ignite-217' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-217
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36f26810 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36f26810 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36f26810 Branch: refs/heads/ignite-51 Commit: 36f2681063e4b447c409f131aa1981b8806eeda5 Parents: 52704a7 bf8c048 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Feb 26 17:54:20 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Feb 26 17:54:20 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 +-- .../java/org/apache/ignite/igfs/package.html | 2 +- .../testsuites/IgniteHadoopTestSuite.java | 7 +- 10 files changed, 95 insertions(+), 81 deletions(-) ----------------------------------------------------------------------
