Update treasuremap version to include upstream rbac fixes

Signed-off-by: James Gu <james.gu@att.com>
Change-Id: I39d186bcd7a29004e3affd9cf2a005a3ff49cbec
(cherry picked from commit c79c2e74171663b14b9af57ecda5aaece183375a)

diff --git a/site/intel-pod15/site-definition.yaml b/site/intel-pod15/site-definition.yaml
index 177daaa..e3cc37e 100644 (file)
--- a/site/intel-pod15/site-definition.yaml
+++ b/site/intel-pod15/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
 ...

diff --git a/site/intel-pod17/site-definition.yaml b/site/intel-pod17/site-definition.yaml
index 24c0d3d..453e2e6 100644 (file)
--- 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
 ...