diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-01 02:45:30 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-01 02:49:59 +0200 |
| commit | a880b5c0fe55397b73f0fcf8f8c87d523327099d (patch) | |
| tree | 8bfac23f954b38f3de75d48a4a5ea3befd0659bb | |
| parent | b7e8a6cfacf7748ef17247d2404fb336ed65c8dc (diff) | |
u/fuel: Enable remote tracking
Always fetch the latest master branch for Fuel@OPNFV (the only git
submodule left), making constant rebase obsolete.
JIRA: ARMBAND-401
Change-Id: I3115e3a569fb18b3e7321aef51d7b0572c54249f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | armband-fuel-config.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 0a84688b..44cc6d80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "opnfv-fuel"] path = upstream/fuel url = https://gerrit.opnfv.org/gerrit/fuel - branch = stable/euphrates + branch = master diff --git a/armband-fuel-config.mk b/armband-fuel-config.mk index a4a0ad5e..5f85f9c7 100644 --- a/armband-fuel-config.mk +++ b/armband-fuel-config.mk @@ -17,7 +17,7 @@ F_PATCH_DIR := ${A_FUEL_BASE}/mcp/patches # To enable remote tracking, set the following var to any non-empty string. # Leaving this var empty will bind each git submodule to its saved commit. -ARMBAND_TRACK_REMOTES ?= +ARMBAND_TRACK_REMOTES ?= yes # for the patches applying purposes (empty git config in docker build container) export GIT_COMMITTER_NAME?=OPNFV Armband |