diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-09-05 12:38:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-05 12:38:38 +0000 |
| commit | 818ea55096b67381a2e4e27285554c9d6239c4ef (patch) | |
| tree | 421acfc272a2acbfca147d507f60c0d4821b6091 | |
| parent | 1da9fde0e50f7c99b180cae979f04e4332cef998 (diff) | |
| parent | 376c76d05862ed38edeb217cd9480807571491a7 (diff) | |
Merge "submodule: Kill fuel-astute"
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch | 5 | ||||
| m--------- | upstream/fuel-astute | 0 |
4 files changed, 1 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 1fffefb1..85b4d3f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,7 +34,3 @@ path = upstream/vswitchperf url = https://gerrit.opnfv.org/gerrit/vswitchperf.git branch = master -[submodule "fuel-astute"] - path = upstream/fuel-astute - url = https://github.com/openstack/fuel-astute.git - branch = stable/mitaka @@ -80,7 +80,6 @@ patches-export: submodules-init .PHONY: patches-import patches-import: submodules-init @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 && \ diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch index df1bd110..844bb3a4 100644 --- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch +++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch @@ -51,7 +51,7 @@ new file mode 100644 index 0000000..1e772f0 --- /dev/null +++ b/build/armband.mk -@@ -0,0 +1,54 @@ +@@ -0,0 +1,51 @@ +############################################################################## +# Copyright (c) 2016 Enea AB and others. +# Alexandru.Avadanii@enea.com @@ -76,9 +76,6 @@ index 0000000..1e772f0 + export FPB_CHANGE := refs/changes/31/311031/2 + + # Armband git submodules for Fuel/OPNFV components -+ export ASTUTE_REPO := ${ARMBAND_BASE}/upstream/fuel-astute -+ export ASTUTE_COMMIT := HEAD -+ + export NAILGUN_REPO := ${ARMBAND_BASE}/upstream/fuel-web + export NAILGUN_COMMIT := HEAD + diff --git a/upstream/fuel-astute b/upstream/fuel-astute deleted file mode 160000 -Subproject 65309028c2b65cee68bb865f3895ed185922f3b |