Merge branches 'ignite-187' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f35754f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f35754f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f35754f Branch: refs/heads/sprint-2 Commit: 9f35754fdaedf0eba1cc7f7f230cab7558305719 Parents: 7cbc678 bf8c048 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Feb 26 20:41:47 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Feb 26 20:41:47 2015 +0700 ---------------------------------------------------------------------- .../ignite/events/DiscoveryCustomEvent.java | 57 ---------------- .../org/apache/ignite/events/EventType.java | 14 ++-- .../internal/events/DiscoveryCustomEvent.java | 68 ++++++++++++++++++++ .../discovery/GridDiscoveryManager.java | 7 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 9 ++- .../internal/GridDiscoveryEventSelfTest.java | 9 +-- 6 files changed, 89 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f35754f/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ----------------------------------------------------------------------
