Merge branches 'ignite-140' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/64addf73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/64addf73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/64addf73 Branch: refs/heads/ignite-6 Commit: 64addf739f29b7c0b363377a5d0e5bc66dd52fef Parents: 88c1fde 8cd67cc Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Feb 3 15:28:12 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Feb 3 15:28:12 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-fabric.xml | 4 ++++ assembly/release-base.xml | 2 +- bin/ignite.bat | 2 +- bin/igniterouter.bat | 2 +- bin/igniterouter.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/include/functions.sh | 2 +- pom.xml | 28 ++++++++++++++-------------- 8 files changed, 24 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64addf73/pom.xml ----------------------------------------------------------------------
