diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-05-21 08:52:05 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-05-21 08:52:05 -0300 |
commit | 8448a42c81da482063233da48dc66a5ddcf7d13d (patch) | |
tree | fbf91cfed9a472c9910e991b010d3209ad62c963 /pkg/requirements.pip | |
parent | 548b413939362e23f7dd84b80519c7eb6c052e76 (diff) | |
parent | a68960c1dcb7670687cb08610c9132cdf9b5a595 (diff) |
Merge remote-tracking branch 'refs/remotes/kali/feature/psutil-compat' into develop
Diffstat (limited to 'pkg/requirements.pip')
-rw-r--r-- | pkg/requirements.pip | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 70427e63..3d6b33a3 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -11,10 +11,7 @@ srp>=1.0.2 pyopenssl python-dateutil -# since gnupg requires exactly 1.2.1, this chokes if we -# don't specify a version. Selecting something lesser than -# 2.0 is equivalent to pick 1.2.1. See #5489 -psutil<2.0 +psutil ipaddr twisted |