delta/openstack/python-ceilometerclient.git, branch 2.1.0

Merge "Token will be lost when constructing a ceilometer client"

2015-11-30T14:25:30+00:00

Updated from global requirements

2015-11-27T22:41:41+00:00

Change-Id: I46395d378a24b926c1bf4030b44f0f7983234d12

Token will be lost when constructing a ceilometer client

2015-11-27T03:22:12+00:00

If parameters os_token and os_endpoint were passed to
ceilometerclient.client.get_client to construct a ceilometer client, the
token will be wrongly replaced with None in method
ceilometerclient.client._adjust_kwargs, which will cause the
authentication error when use the instance of ceilometer client later.
This patch fixed this problem.

Change-Id: Ib15cdd73b62b7f0b86d0bd6f19d344fd24a665f6
Closes-Bug: #1519729

Merge "Ensure metering is the default service_type"

2015-11-27T00:45:20+00:00

Merge "Ensure keystoneauth1 exception are raised"

2015-11-27T00:38:26+00:00

Merge "Correct an api reference error"

2015-11-26T23:33:11+00:00

Merge "Ignores endpoint_type if interface is provided"

2015-11-26T23:33:02+00:00

Correct an api reference error

2015-11-24T21:55:49+00:00

Correct a nit doc string error which is populated into api reference
doc.

Change-Id: I53e2d5ea820891d90f522889743ce94802f0576e

Merge "Remove double API requests"

2015-11-23T16:39:00+00:00

Merge "Catch exception raised by keystoneauth1"

2015-11-23T16:19:16+00:00