Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/in…
…cubator-ignite into ignite-futures-cleanup-1 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopNoopProcessor.java modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
- Loading branch information
Yakov Zhdanov
committed
Mar 5, 2015
1 parent
17ac360
commit cce63fd
Showing
1 changed file
with
2 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters