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/03334142 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/03334142 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/03334142 Branch: refs/heads/ignite-164v2 Commit: 033341421d2679b459a39de73e2d5bc5fb1311be Parents: 08213df 09fae94 Author: ivasilinets <vasilinetc....@gmail.com> Authored: Thu Feb 5 17:01:09 2015 +0300 Committer: ivasilinets <vasilinetc....@gmail.com> Committed: Thu Feb 5 17:01:09 2015 +0300 ---------------------------------------------------------------------- bin/ignite.sh | 2 +- bin/igniterouter.sh | 2 +- bin/ignitevisorcmd.sh | 2 +- bin/include/functions.sh | 2 +- bin/setup-hadoop.sh | 2 +- modules/yardstick/config/benchmark-atomic-win.properties | 2 +- modules/yardstick/config/benchmark-atomic.properties | 2 +- modules/yardstick/config/benchmark-compute-win.properties | 2 +- modules/yardstick/config/benchmark-compute.properties | 2 +- modules/yardstick/config/benchmark-query-win.properties | 2 +- modules/yardstick/config/benchmark-query.properties | 4 ++-- modules/yardstick/config/benchmark-tx-win.properties | 2 +- modules/yardstick/config/benchmark-tx.properties | 2 +- modules/yardstick/config/benchmark-win.properties | 2 +- modules/yardstick/config/benchmark.properties | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
