diff options
Diffstat (limited to 'site/intel-pod15')
| -rw-r--r-- | site/intel-pod15/site-definition.yaml | 4 |
1 files changed, 4 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 ... |