commit d4c860c092ad5ebcff7df5f4d4e75b36ee3ad958
author Krzysztof Opasiak <k.opasiak@samsung.com> Tue May 19 21:35:23 2020 +0000
committer Gerrit Code Review <gerrit@onap.org> Tue May 19 21:35:23 2020 +0000
tree 9732d68ea7e4aa1ddb037f8ddd7e9d8c441181f4
parent a7c75cde58bb300c3cec79e794a7f8e9d0778eaa
parent 7344c288f326851595ecd2971e91ea912a1853de

Merge "Fix policy api credentials for oof in oom"

.gitmodules

diff --git a/.gitmodules b/.gitmodules
index ddad6f6..19cca65 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "kubernetes/aai"]
   path = kubernetes/aai
   url = ../aai/oom
-  branch = frankfurt
+  branch = master
   ignore = dirty
 [submodule "kubernetes/robot"]
   path = kubernetes/robot
   url = ../testsuite/oom
-  branch = frankfurt
+  branch = master
   ignore = dirty
 

kubernetes/aai

diff --git a/kubernetes/aai b/kubernetes/aai
index d687fd0..2aba1f4 160000
--- a/kubernetes/aai
+++ b/kubernetes/aai
@@ -1 +1 @@
-Subproject commit d687fd0c9efe31e93287da11e3e390984a5fb6ce
+Subproject commit 2aba1f4b1c872ddf429f4635b982b3e15ecc4aac

kubernetes/robot

diff --git a/kubernetes/robot b/kubernetes/robot
index 1bc31c7..77f1d25 160000
--- a/kubernetes/robot
+++ b/kubernetes/robot
@@ -1 +1 @@
-Subproject commit 1bc31c7d76408bdf2267bf72bf3b1b1e18e2367f
+Subproject commit 77f1d25542848d7a5fd32f57436c9f413e0a5919