Updated openstack/openstack
Project: openstack/heat  b978b2e6e5144a22709ae93b57a0d0fbfe56a2ab
null
Remove unused variable badkeys

Since it's never used and consumed a set subtraction.

Change-Id: Ic2231ad5e491527c7f746172d9a3e07a6623b823
Updated openstack/openstack
Project: openstack/neutron  0a522b53d1ddee6017e156f145f0c8862052e56e
null
Fix a race condition in agents status update code

Code handling agents status updates coming via RPC checks,
if a corresponding entry for the given (agent_type, host)
pair already exists in DB and updates it. And if it doesn't
exist, a new entry is created.

Without a unique constraint this can cause a race condition
resulting in adding of two agent entries having the same value
of (agent_type, host) pair.

Note, that it's already not allowed to have multiple agents of
the same type having the same host value, but currently it's
enforced only at code level, not at DB schema level, which
effectively makes race conditions possible.

Closes-Bug: #1254246

Change-Id: I1ebaa111154b3d6b34074705b579097ab730594c