Updated openstack/openstack
Project: openstack/horizon  08001466109a8ea9dfb84637dfacd13813a0be7c
null
Fixing heat stack status column

Status column on stack table was using stack_status instead of status
Status is a little more vague, but keeps Horizon from having to know
about all of the various Heat statuses (it was incorrectly displaying
progress meters for several of them before this fix)

Updated topology view with the same fix.

Implements: blueprint heat-fix-status-column
Change-Id: I3ad24d837dd5e9046aa8a91cce33b954b7a8e5d9
Updated openstack/openstack
Project: openstack/neutron  cdec8e52a22b211ab9fa8a2096f7890bb1ef8654
null
Fix DetachedInstanceError for Agent instance

The stacktrace observed seems to hint to a
situation where a session is not properly
rolled back when duplicate agent entries are
found.

Since it is ok to deal with duplicates, the
addition of agents to the DB must be done
one by one, otherwise we go against the
ATOMICITY property of a transaction of all
or none. It's either that or I am barking at
the wrong tree.

This patch also added UT to cover affected
code.

Closes-bug: 1282421
Related-bug: 1282253

Change-Id: Ic5f77808cc10f885d67f5a9cf3b3836283692850