Permalink
Browse files

Merge branch '1.1' into 1.2

  • Loading branch information...
bitprophet committed Nov 4, 2011
2 parents 69fd0e9 + 910d444 commit 23da3d03a7a1e562a86fa2a6315e9fd6f7871ca2
Showing with 2 additions and 2 deletions.
  1. +1 −1 requirements.txt
  2. +1 −1 setup.py
View
@@ -8,7 +8,7 @@
pycrypto >= 1.9
nose
-rudolf
+-e git+https://github.com/bitprophet/rudolf#egg=rudolf
coverage
pylint
Fudge < 1.0
View
@@ -38,7 +38,7 @@
packages=find_packages(),
test_suite='nose.collector',
tests_require=['nose', 'fudge'],
- install_requires=['pycrypto >= 1.9, < 2.4', 'paramiko >=1.7.6'],
+ install_requires=['pycrypto >= 1.9, != 2.4', 'paramiko >=1.7.6'],
entry_points={
'console_scripts': [
'fab = fabric.main:main',

0 comments on commit 23da3d0

Please sign in to comment.