Merge branch 'sprint-2' into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36fb3626 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36fb3626 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36fb3626 Branch: refs/heads/sprint-2 Commit: 36fb3626b096f503c050100c46d440048f15f804 Parents: b9462ea 22bdbce Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Mar 24 14:33:44 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Mar 24 14:33:44 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/igfs/IgfsEx.java | 3 ++ .../visor/node/VisorIgfsConfiguration.java | 11 +++++++ .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 26 ++++++++++++++-- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 4 ++- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 4 ++- .../internal/processors/hadoop/HadoopSetup.java | 8 ++--- .../hadoop/SecondaryFileSystemProvider.java | 31 ++++++++++++++------ ...oopSecondaryFileSystemConfigurationTest.java | 4 +-- 8 files changed, 70 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/36fb3626/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopSecondaryFileSystemConfigurationTest.java ----------------------------------------------------------------------
