diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2016-11-29 13:40:58 +0300 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2016-11-29 15:31:42 +0300 |
| commit | 367bc372ae77a2b6681d807865250415abe9a94c (patch) | |
| tree | 6a979ca06cc94f4e3b26ebda7f23c63697431931 | |
| parent | f9f173106d9328d325a9d86314c92bb2af77da7e (diff) | |
Turn on remote tracking of submodules
JIRA: FUEL-234
Change-Id: I916cc94f58df2f2227384c73eda556f448ac50b5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | build/f_repos/Makefile | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 290b74223..4d35439d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -51,7 +51,7 @@ [submodule "network-checker"] path = build/f_repos/sub/network-checker url = https://github.com/openstack/network-checker.git - branch = master + branch = stable/newton ignore = all [submodule "fuel-ui"] path = build/f_repos/sub/fuel-ui diff --git a/build/f_repos/Makefile b/build/f_repos/Makefile index f09dbedd1..b5eafff9b 100644 --- a/build/f_repos/Makefile +++ b/build/f_repos/Makefile @@ -35,9 +35,7 @@ include ../config.mk # 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. # NOTE: For non-stable branches, unless overriden, always track remotes -# Need to disable this logic temporarily as Newton doesn't seem to have stable -# branches in all repos. /Stefan -# FUEL_TRACK_REMOTES ?= $(shell git symbolic-ref --short HEAD | grep -v stable) +FUEL_TRACK_REMOTES ?= $(shell git symbolic-ref --short HEAD | grep -v stable) .PHONY: all all: release |