summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrudence Au <prudence.au@amdocs.com>2019-08-01 20:08:33 -0400
committerPrudence Au <prudence.au@amdocs.com>2019-08-01 20:10:01 -0400
commitd6df55c79013e174e8e5880232bcbe4a98ce0869 (patch)
treea9a3d4be44f86baadd20a1bd56ce98b7d23d7995
parentfe7f065eaa20e08aace608493d9b18dced94c15b (diff)
Picking up aai/oom from the master branch
Issue-ID: OOM-2027 Signed-off-by: Prudence Au <prudence.au@amdocs.com> Change-Id: I1d969742e3a79f06e0d26da3f06b1959f661f929
-rw-r--r--.gitmodules4
m---------kubernetes/aai0
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 455b690a6f..c996441014 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
[submodule "kubernetes/aai"]
path = kubernetes/aai
url = ../aai/oom
- branch = master
- ignore = dirty
+ branch = master
+ ignore = dirty
diff --git a/kubernetes/aai b/kubernetes/aai
-Subproject 6509a172751b3c85995100e3d3a205abe73b116
+Subproject c2d6e68b32be2bc2a421f21d23b12abdf314198