Repository: incubator-ignite Updated Branches: refs/heads/ignite-368 ab6119ec6 -> b330068fe
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-333 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/18d48c1e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/18d48c1e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/18d48c1e Branch: refs/heads/ignite-368 Commit: 18d48c1e32aef3826d95699e7c36749b16a7479c Parents: a094c88 6abda67 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Mar 12 15:30:29 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Mar 12 15:30:29 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(-) ----------------------------------------------------------------------
