Merge branch 'master' into ldapreferfix

This commit is contained in:
Joseph Schorr 2015-05-27 15:15:47 -04:00
commit 386b1710ed
14 changed files with 403 additions and 40 deletions

View file

@ -21,7 +21,6 @@ paramiko
xhtml2pdf
redis
hiredis
docker-py
flask-restful==0.2.12
jsonschema
git+https://github.com/NateFerrero/oauth2lib.git
@ -51,4 +50,6 @@ pygpgme
cachetools
mock
psutil
stringscore
stringscore
python-swiftclient
python-keystoneclient