Updated openstack/openstack
Project: openstack/horizon  afc501b802deaf7dea79505629531a54926e794f
null
Fix charts display in Resource Usage

    Due to an error in a patch, the line 638 of horizon.d3linechart.js
has been commented. The consequence of this is that now charts are not
displayed in the Resource usage panel.

Fixes bug #1266505

Change-Id: Ifc9aa6100efdba6c3efd1ea47638a7934f457913
Updated openstack/openstack
Project: openstack/heat  8b982e8e3e28d0831ae04f2252c80307ff3983cb
null
Add ability to configure Heat and Trove client options

Make the client parameters "ca_file", "cert_file" "insecure" and
"key_file" configurable for Heat client and Trove client.
Partial-Bug: #1263165

Change-Id: If5e1669327db91fa2e0482b429611757df21fa88