]> review.fuel-infra Code Review - openstack-build/heat-build.git/commit
Code Review / openstack-build / heat-build.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: f3ab48b) | patch
Use password in preference to token if both supplied
authorZane Bitter <zbitter@redhat.com>
Tue, 16 Oct 2012 14:33:55 +0000 (16:33 +0200)
committerZane Bitter <zbitter@redhat.com>
Wed, 17 Oct 2012 08:21:10 +0000 (10:21 +0200)
commita97c6d3181a3d09751c3f88eee5a43e9eed0ad37
tree3a5b16104907464c857132dbde2c72ef6d7a1cbetree | snapshot
parentf3ab48b64e13d681ff4d07aae67c31fb6c266683commit | diff
Use password in preference to token if both supplied

Fixes #263 - devstack is providing a token in the environment, which was
causing the wrong path to get hit.

Change-Id: I9aae346e57fdfe156e52d4696e8f2f859884ff2f
Signed-off-by: Zane Bitter <zbitter@redhat.com>
heat/engine/auth.py diff | blob | history