openstack
/
openstack
Code Issues Proposed changes

Update git submodules 

* Update devstack from branch 'master'
  - Merge "Merge (don't overwrite) $NOVA_CPU_CONF"
  - Merge (don't overwrite) $NOVA_CPU_CONF
    
    Per the referenced bug, $NOVA_CPU_CONF was previously being initialized
    by copying $NOVA_CONF, thereby trashing any values already configured in
    $NOVA_CPU_CONF.
    
    With this commit, we merge the values from $NOVA_CPU_CONF in after the
    copy.
    
    Note that this makes use of the merge_config_file function, which is
    defined in inc/meta-config, which wasn't being sourced from every code
    path that hit start_nova_compute; so this commit also moves that import
    from stack.sh to functions (next to the other imports from inc/, which
    makes sense anyway).
    
    Change-Id: Id3e2baa2221e13f512f8dcf1248e1e15b6a7597f
    Closes-Bug: #1802143
This commit is contained in:
Zuul 2019-08-22 18:37:25 +00:00 committed by Gerrit Code Review
parent e639ea9454
commit 384eca17db
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack

@ -1 +1 @@
Subproject commit 78e94096cea12d6f254159de4bedd66c2edf5402
Subproject commit 6926ed8ac5f04baabf0bef16e2b30f41747b8cf9