Updated openstack/openstack
Project: openstack/horizon  56addb790a40da1feae360f3f413dc1f539ed01a
null
Just fix some minor coding styles inconsistency in local_settings.py.

Change-Id: I64a25b31fc53e4166f9ef3fd8903cc843b389c24
Updated openstack/openstack
Project: openstack/python-ceilometerclient  b3da9638264d3bc57a1341e86cc860c496195cfc
null
Update v2.options docstring

We already support 'type' attribute for query, but the docstring for
build_url and cli_to_array don't refer to it.

And the urlencode with doseq=True will force filter parameters grouped
by name, so the sample in build_url docstring should be corrected too.

Change-Id: I2b526d9e23175b5378ea36e0a532052269c7f0c4