summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-07-16 14:25:03 +0200
committerAlexis de Talhouët <adetalhouet89@gmail.com>2019-09-02 18:55:01 +0000
commitbf365bf00a209161a3d21703480c9a347bc3766e (patch)
tree25f1f5d20c768bd4bdd457bc4b87d07fb5dfeb67
parent55c686c83695aaa131bee70fe7618c93e1d0cb9b (diff)
Set master as branch in .gitmodules
It avoids the next fatal error when updating gitmodules from doc (double levels of submodules). Submodule (kubernetes/aai) branch configured to inherit branch from superproject, but the superproject is not on any branch. Issue-ID: DOC-505 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> Change-Id: Id2d6434210003c20de74fc6da87125c54506cfd1
-rw-r--r--.gitmodules2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index e01f7e520f..08d7aea901 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
[submodule "kubernetes/aai"]
path = kubernetes/aai
url = ../aai/oom
- branch = .
+ branch = master
ignore = dirty
[submodule "kubernetes/robot"]
path = kubernetes/robot