Merge branch 'ignite-409' into sprint-2
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.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/302e683e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/302e683e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/302e683e
Branch: refs/heads/ignite-525
Commit: 302e683ef886368d00fa4cb1e35f54480930da39
Parents: dfcfc0e a7c201c
Author: Artem Shutak <[email protected]>
Authored: Fri Mar 20 16:27:18 2015 +0300
Committer: Artem Shutak <[email protected]>
Committed: Fri Mar 20 16:27:18 2015 +0300
----------------------------------------------------------------------
.../managers/discovery/GridDiscoveryManager.java | 6 +++---
.../processors/cache/GridCacheEvictionManager.java | 2 +-
.../cache/GridCachePartitionExchangeManager.java | 2 +-
.../internal/processors/clock/GridClockServer.java | 2 +-
.../processors/clock/GridClockSyncProcessor.java | 2 +-
.../ignite/internal/processors/igfs/IgfsServer.java | 4 ++--
.../internal/processors/igfs/IgfsServerManager.java | 4 ++--
.../processors/timeout/GridTimeoutProcessor.java | 2 +-
.../ignite/internal/util/worker/GridWorker.java | 14 +++-----------
.../communication/HadoopExternalCommunication.java | 4 ++--
10 files changed, 17 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/302e683e/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
