Updated openstack/openstack
Project: openstack/heat  3110364647bb5c77818dcc00ba50902d31f2cb15
null
Fix stack-show on a TemplateResource with outputs

TemplateResource currently tries to re-download the template.
this is not good, esp. if you have a relative path to a local file.
First see if we have a new template, if not look in the db.

Closes-bug: #1252980
Change-Id: If819aab9ed1360744f8e73f0b6409641e2d8114f
Updated openstack/openstack
Project: openstack/neutron  5871473fd87dbc28463ce829855347173101f404
null
Removed erronus config file comment

The comment stating 'DHCP agents needs it.' with regards to the
rpc_notifier notification_driver is incorrect.  Looking through
the code, I see no place this is true.  I believe it to be an
error.

Closes-Bug: #1258390

Change-Id: I58c2f9290731f3e88e4b4a5bdb600aa5bac1a12b