Merge branch 'ignite-164v2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-164v2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/701baf1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/701baf1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/701baf1a Branch: refs/heads/sprint-1 Commit: 701baf1a4b52ccad020af1a0dfdd64251f4385e7 Parents: 01708f9 5ec80fd Author: ivasilinets <vasilinetc....@gmail.com> Authored: Thu Feb 5 17:35:31 2015 +0300 Committer: ivasilinets <vasilinetc....@gmail.com> Committed: Thu Feb 5 17:35:31 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 22 ++++++++--------- bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 26 ++++++++++---------- bin/ignitevisorcmd.sh | 2 +- bin/include/functions.sh | 4 +-- bin/include/parseargs.bat | 2 +- bin/include/service.sh | 2 +- bin/include/setenv.bat | 10 ++++---- bin/include/setenv.sh | 6 ++--- bin/setup-hadoop.bat | 2 +- config/hadoop/default-config.xml | 4 +-- .../apache/ignite/hadoop/GridHadoopSetup.java | 4 +-- 12 files changed, 43 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
