Skip to content
This repository has been archived by the owner on Oct 22, 2019. It is now read-only.

Commit

Permalink
Merge pull request #142 from mikev/master
Browse files Browse the repository at this point in the history
Fix calico support for the etcd3 server.  Use specific commit of python-etcd client.
  • Loading branch information
matthewdupre authored Sep 1, 2016
2 parents 139777a + fae9854 commit 4e50884
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build-requirements-frozen.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ docopt==0.6.2
netaddr==0.7.18
prettytable==0.7.2
PyInstaller==3.1.1
python-etcd==0.4.3
git+https://github.com/jplana/python-etcd.git@0d0145f5e835aa032c97a0a5e09c4c68b7a03f66
prometheus_client==0.0.13
PyYAML==3.11
requests==2.9.1
Expand Down
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
# your project is installed. For an analysis of "install_requires" vs pip's
# requirements files see:
# https://packaging.python.org/en/latest/requirements.html
install_requires=['netaddr', 'python-etcd>=0.4.2', 'subprocess32'],

install_requires=['netaddr', 'python-etcd>=0.4.3', 'subprocess32'],
dependency_links=[
"https://github.com/jplana/python-etcd.git@0d0145f5e835aa032c97a0a5e09c4c68b7a03f66"
]
)

0 comments on commit 4e50884

Please sign in to comment.