summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2019-09-12 13:53:11 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-12 13:53:11 +0000
commite6dd4bdca1fbba259cb2af3b8ef9a39dbf73afa2 (patch)
treed281ea1a5e183e36f60477f8be1bd3a3fd28ddf8
parent20fa2f2b1f682c3c59f98d230684d81a592283f0 (diff)
parent7912f4215bc5264cf8c67c8ded63d7ff04ee5aaf (diff)
Merge "Fix .gitmodules (use dublin instead of .)" into dublindublin
-rw-r--r--.gitmodules2
m---------kubernetes/aai0
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 31bff54529..a76fe1bf97 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
[submodule "kubernetes/aai"]
path = kubernetes/aai
url = ../aai/oom
- branch = .
+ branch = dublin
ignore = dirty
diff --git a/kubernetes/aai b/kubernetes/aai
-Subproject a1e0153fcc6ba67737f23fa0b14c95b0ab66d18
+Subproject 6509a172751b3c85995100e3d3a205abe73b116