Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-gg-fix-deploy
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07905ba4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07905ba4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07905ba4
Branch: refs/heads/ignite-sql-tests
Commit: 07905ba44924473b51c7a9b1c827d3dc12797bbe
Parents: 9f44e10 bf8c048
Author: avinogradov <avinogra...@gridgain.com>
Authored: Thu Feb 26 18:45:04 2015 +0300
Committer: avinogradov <avinogra...@gridgain.com>
Committed: Thu Feb 26 18:45:04 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(-)
----------------------------------------------------------------------
