Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4e7097b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4e7097b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4e7097b0 Branch: refs/heads/ignite-51 Commit: 4e7097b0667af2414e63fb9e36b8947ade72ffb3 Parents: 4e152a2 bf8c048 Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu Feb 26 17:18:23 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu Feb 26 17:18:23 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(-) ----------------------------------------------------------------------
