From 13ed0ee7455ddb80d0ca7db2c09fb7f078bd7f9e Mon Sep 17 00:00:00 2001 From: James Gu Date: Wed, 20 Jan 2021 07:24:24 -0800 Subject: Update treasuremap version to include upstream rbac fixes Signed-off-by: James Gu Change-Id: I39d186bcd7a29004e3affd9cf2a005a3ff49cbec (cherry picked from commit c79c2e74171663b14b9af57ecda5aaece183375a) --- site/intel-pod17/site-definition.yaml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'site/intel-pod17') diff --git a/site/intel-pod17/site-definition.yaml b/site/intel-pod17/site-definition.yaml index 24c0d3d..453e2e6 100644 --- a/site/intel-pod17/site-definition.yaml +++ b/site/intel-pod17/site-definition.yaml @@ -12,6 +12,10 @@ data: repositories: global: +<<<<<<< HEAD (ea42d6 Catch NeutronNetworks.create_and_*routers in blacklist) revision: v1.8 +======= + revision: 94f354467b7bbe1cd464b7803b3369296ca55e35 +>>>>>>> CHANGE (c79c2e Update treasuremap version to include upstream rbac fixes) url: https://opendev.org/airship/treasuremap.git ... -- cgit 1.2.3-korg