tree ccd29a263e842aebc3df8d2781945a9391489aaf
parent a2bfaeafd64f3f6079970a8277a90917eaa84a6c
parent f3ced00552c1c7d4a6184500af9062cfb4ff4463
author Kevin Pike <kpike@doubledutch.me> 1429834462 -0700
committer Kevin Pike <kpike@doubledutch.me> 1429834462 -0700

Merge branch 'master' of https://github.com/rackspace/gophercloud into personality

Conflicts:
	openstack/compute/v2/servers/requests_test.go