diff options
| author |   James Gu <james.gu@att.com> | 2021-01-20 07:24:24 -0800 |
|---|---|---|
| committer | James Gu <james.gu@att.com> | 2021-01-20 15:30:15 +0000 |
| commit | 13ed0ee7455ddb80d0ca7db2c09fb7f078bd7f9e (patch) | |
| tree | bcfe371306b559c2e7f6c1dbbb45d3f03f78f7cd | |
| parent | ea42d6844a6e9efdf6685030955d6ad5a7367f09 (diff) | |
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)
| -rw-r--r-- | site/intel-pod15/site-definition.yaml | 4 | ||||
| -rw-r--r-- | site/intel-pod17/site-definition.yaml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/site/intel-pod15/site-definition.yaml b/site/intel-pod15/site-definition.yaml index 177daaa..e3cc37e 100644 --- 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 --- 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 ... |