Updated openstack/openstack
Project: openstack/keystone  a56154b6dfdb6ab36246d8a412616d34ef7a814e
null
Ability to turn off ldap referral chasing

When getting an ldap connection, check a config property to see if
referral chasing should be turned off.

Co-Authored-By: Dolph Mathews <dolph.mathews@gmail.com>
Change-Id: I3bb5cc11b3c5c9108cfa656d5f5de1eaeb103fe5
Closes-Bug: 1233365
Updated openstack/openstack
Project: openstack/nova  973aa334cbca1ed1d9282f7d6c5d069748a6c6c2
null
Fix raise_http_conflict_for_instance_invalid_state docstring

The docstring says it's returning an HTTPConflict exception but it's
actually raising one, there is no return value to the method. This can
also be implied from the method name, but the docstring should be
accurate.

Change-Id: I23f005db0342008f20dcbfe90e63a87339c98716