Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6553549f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6553549f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6553549f Branch: refs/heads/ignite-30 Commit: 6553549ff534fb64d1e4405b5f7cde50b84304c6 Parents: aa812a1 21e328d Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Apr 7 16:00:02 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Apr 7 16:00:02 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/include/service.sh | 8 +++++--- config/hadoop/default-config.xml | 15 ++++++++++----- 4 files changed, 17 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
