Merge remote-tracking branch 'upstream/master' into python-registry-v2

This commit is contained in:
Jake Moshenko 2015-10-26 14:44:16 -04:00
commit 2c10d28afc
13 changed files with 57 additions and 36 deletions

View file

@ -100,6 +100,6 @@ git+https://github.com/coreos/mockldap.git
git+https://github.com/coreos/py-bitbucket.git
git+https://github.com/coreos/pyapi-gitlab.git@timeout
git+https://github.com/coreos/resumablehashlib.git
git+https://github.com/coreos/mockldap.git
git+https://github.com/coreos/resumablehashlib.git
git+https://github.com/DevTable/python-etcd.git@sslfix
git+https://github.com/NateFerrero/oauth2lib.git