Merge "Fix service API and cells"
Merge "Add nova.conf.sample to gitignore"
Merge "Add InstanceGroup.get_by_name()"
Merge "Automatically create groups that do not exist"
Fix the section name in CONTRIBUTING.rst

The name of the section 'if you'are developer...' has changed
in the wiki. This commit updates it to correctly refer to
the good section.

Change-Id: I76767250b45e2550ac1601349a562a7641d41fc3
Add a note about deprecated group filters

The deprecated group filters do not work if both are enabled at the
same time.  Add this in a note in the docs on the different scheduler
filters.

DocImpact
Related-bug: #1296913

Change-Id: Ic0e1b8b59c8a462e193dffb3b0f873d8aa35aa3c
Merge "Updated from global requirements"
Merge "Add new style instance group scheduler filters"
Remove zmq-receiver from setup.cfg

In commit 1a91aac we removed the zmq-receiver script (in favor of
oslo-messaging-zmq-receiver) but forgot to remove the entry from
setup.cfg.

Closes-Bug: #1279739
Change-Id: Icd08a5b28daee7234abd24ba502c56cc00abcb8c
Merge "Handle IpAddressGenerationClient neutron"
Merge "Change exception type from HTTPBadRequest to HTTPForbidden"
Merge "Add a note about deprecated group filters"
Merge "Remove zmq-receiver from setup.cfg"
Merge "Fix the section name in CONTRIBUTING.rst"
Make conductor expect ActionEventNotFound for action methods

The action_event_start() and action_event_finish() methods can
raise InstanceActionEventNotFound exceptions. Make sure these
get forwarded to the caller without logging them against the
conductor service.

Co-Authored-By: Matt Riedemann <mriedem@us.ibm.com>
Change-Id: I4d0bf185f515efac0eaa5245e5270e6e1877d8da
Merge "Refactors nova.image.glance unit tests for show()"
Merge "Refactors unit tests of image service detail()"
VMware: clean up VNC console handling

Commit 61bfac8881dd6a71a572a54b2ea1680248fc4bc4 introduced
the VMwareVCVMOps class. This class specifcally treats VC methods.
The patch set moves the treatment for get_vnc_console to this
class.

The log message for the VNC console now has the instance as a
parameter.

Please note that there are already test cases for this.

Change-Id: I2b943558d96328580f5c8744945e5f5f1790c06f
VMware: remove double import

"import mock" was done twice.

Change-Id: Ibc38d27d7fd8b57b193cbe37d2abd89b823ed43f
Improved logs for add/remove security group rules.

Added more details - protocol and port information to AUDIT log
messages on add/remove rule actions for security groups.

Change-Id: Ib446a63976dade90c51c13f30367a3ee17a739ea
Closes-Bug: #1154303