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/bdba9341 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bdba9341 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bdba9341 Branch: refs/heads/ignite-422 Commit: bdba93412c1d3a349dca19f8b2048ec3f3e40421 Parents: 4df20f3 6805b7e Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Mar 11 16:28:05 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Mar 11 16:28:05 2015 +0700 ---------------------------------------------------------------------- .../org/apache/ignite/internal/processors/igfs/IgfsServer.java | 3 ++- .../org/apache/ignite/internal/processors/hadoop/HadoopSetup.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
