From d6df55c79013e174e8e5880232bcbe4a98ce0869 Mon Sep 17 00:00:00 2001 From: Prudence Au Date: Thu, 1 Aug 2019 20:08:33 -0400 Subject: Picking up aai/oom from the master branch Issue-ID: OOM-2027 Signed-off-by: Prudence Au Change-Id: I1d969742e3a79f06e0d26da3f06b1959f661f929 --- .gitmodules | 4 ++-- kubernetes/aai | 2 +- 2 files changed, 3 insertions(+), 3 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 index 6509a17275..c2d6e68b32 160000 --- a/kubernetes/aai +++ b/kubernetes/aai @@ -1 +1 @@ -Subproject commit 6509a172751b3c85995100e3d3a205abe73b116c +Subproject commit c2d6e68b32be2bc2a421f21d23b12abdf314198c -- cgit 1.2.3-korg