From: Alexandru Avadanii Date: Tue, 6 Sep 2016 16:17:06 +0000 (+0000) Subject: Merge "Revert "submodule: Kill fuel-astute"" X-Git-Tag: danube.1.RC1~163 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=463bbc0d41c8359712dc7fa3ad49821793042e21;p=armband.git Merge "Revert "submodule: Kill fuel-astute"" --- 463bbc0d41c8359712dc7fa3ad49821793042e21 diff --cc Makefile index ccd3b5f0,d5444cdb..d3bc979a --- a/Makefile +++ b/Makefile @@@ -79,7 -79,9 +79,8 @@@ patches-export: submodules-ini # For repos pinned in Fuel@OPNFV's config.mk, checkout pinned commit first .PHONY: patches-import patches-import: submodules-init - @cd ${FUEL_BASE} && git checkout -q master @cd ${SUBMOD_DIR}/fuel-agent && git checkout -q ${FUEL_AGENT_COMMIT} + @cd ${SUBMOD_DIR}/fuel-astute && git checkout -q ${ASTUTE_COMMIT} @cd ${SUBMOD_DIR}/fuel-library && git checkout -q ${FUELLIB_COMMIT} @cd ${SUBMOD_DIR}/fuel-mirror && git checkout -q ${FUEL_MIRROR_COMMIT} @cd ${SUBMOD_DIR}/fuel-nailgun-agent && \