Merge branch 'ignite-463' 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/6abda67e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6abda67e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6abda67e Branch: refs/heads/master Commit: 6abda67ebfa190e45de7514ca4d4abc8c675d64e Parents: dc941c6 a9fc9b6 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Thu Mar 12 14:28:18 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Thu Mar 12 14:28:18 2015 +0300 ---------------------------------------------------------------------- assembly/release-hadoop.xml | 16 +-- docs/core-site.ignite.xml | 90 ------------- docs/hadoop_readme.md | 134 ------------------ docs/hadoop_readme.pdf | Bin 82297 -> 0 bytes docs/hive-site.ignite.xml | 37 ----- docs/mapred-site.ignite.xml | 66 --------- modules/hadoop/config/core-site.ignite.xml | 90 +++++++++++++ modules/hadoop/config/hive-site.ignite.xml | 37 +++++ modules/hadoop/config/mapred-site.ignite.xml | 66 +++++++++ modules/hadoop/docs/hadoop_readme.md | 135 +++++++++++++++++++ modules/hadoop/docs/hadoop_readme.pdf | Bin 0 -> 82297 bytes .../internal/processors/hadoop/HadoopSetup.java | 33 ++++- .../hadoop/HadoopCommandLineTest.java | 16 ++- 13 files changed, 377 insertions(+), 343 deletions(-) ----------------------------------------------------------------------
