FAQ | This is a LIVE service | Changelog

Skip to content
Snippets Groups Projects
Commit be124527 authored by John Garbutt's avatar John Garbutt
Browse files

Merge remote-tracking branch 'origin/scientific-openstack/train' into... 

Merge remote-tracking branch 'origin/scientific-openstack/train' into johng-merge-upstream-into-staging

Conflicts:
etc/kayobe/overcloud-dib.yml
parents e1a037f4 f1da8aa4
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 276 additions and 6 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment