Updated openstack/openstack
Project: openstack/trove  71446a6f177a89fc04b7c662cc05cbe4a77eea8b

Remove admin_token from configs

A previous review removed the admin_token from the sample config file.
It appears that devstack doesn't use that file but instead uses one of
the .test files.

Admin tokens are actively discouraged as a form of authenticating in
auth_token middleware and the behaviour when using admin_token in
combination with a username and password (as this default produces in
devstack) can lead to problems in authentication.

Closes-Bug: #1299332
Change-Id: I78d2c184f7937006b808d580e3663ab055f7c5fe
Updated openstack/openstack
Project: openstack/python-troveclient  9844f4dcdcd44bf9566ad182b3efd531d7c6f38d

fixed several pep8 issues

  * E265 block comment should start with '# '
  * E128 continuation line under-indented for visual indent
  * E713 test for membership should be 'not in'

Tested with pep8 version 1.5.6 (2014-04-14).

Change-Id: If2853c79bea91ebef5cd97dff66788b46b174a9a