Updated openstack/openstack
Project: openstack/horizon  1912cc6a88dca7238da7c444a1ede84b983ab354
null
Broken charting for non compute resources

- Code for resource charts contained query that
  filtered only nova instances. That condition
  is removed. Now it filters resources by the
  meter name.

Fixes bug 1243796

Conflicts:
	openstack_dashboard/dashboards/admin/metering/tests.py

Change-Id: I7debb2b457ede83b726934c082f22307ddc0c630
(cherry picked from commit 1e1da618bb75783e1d8316894705c01f7bb9153b)