Merge pull request #172 from jzelinskie/pyetcd

reqs: fallback to vendored python-etcd

requirements-nover.txt

@@ -39,6 +39,7 @@ git+https://github.com/coreos/peewee.git
 git+https://github.com/coreos/py-bitbucket.git
 git+https://github.com/coreos/pyapi-gitlab.git
 git+https://github.com/coreos/mockldap.git
+git+https://github.com/DevTable/python-etcd.git@sslfix
 gipc
 pyOpenSSL
 pygpgme
@@ -50,4 +51,3 @@ python-swiftclient
 python-keystoneclient
 Flask-Testing
 pyjwt
-python-etcd

requirements.txt

@@ -38,6 +38,7 @@ MarkupSafe==0.23
 mixpanel==4.1.0
 mock==1.0.1
 msgpack-python==0.4.6
+ndg-httpsclient==0.4.0
 netaddr==0.7.14
 netifaces==0.10.4
 oauthlib==0.7.2
@@ -60,7 +61,6 @@ PyMySQL==0.6.6
 pyOpenSSL==0.15.1
 PyPDF2==1.24
 python-dateutil==2.4.2
-python-etcd==0.3.3
 python-keystoneclient==1.6.0
 python-ldap==2.4.19
 python-magic==0.4.6
@@ -95,4 +95,5 @@ git+https://github.com/coreos/peewee.git
 git+https://github.com/coreos/py-bitbucket.git
 git+https://github.com/coreos/pyapi-gitlab.git
 git+https://github.com/coreos/mockldap.git
+git+https://github.com/DevTable/python-etcd.git@sslfix
 git+https://github.com/NateFerrero/oauth2lib.git