diff options
| author | Ryan Lane <laner@controller> | 2010-12-22 23:47:31 +0000 |
|---|---|---|
| committer | Ryan Lane <laner@controller> | 2010-12-22 23:47:31 +0000 |
| commit | 5012ccb22724c2f7fb0fcdcb7b146d5d5e61337d (patch) | |
| tree | 3d44d084647c86c41cc189d3a8bf8bcdedba3ef7 /tools | |
| parent | e893be0a8d32cf1eb2c91187b81a6febf90e5b7c (diff) | |
| parent | 3f37287c1adfe35756c58938ea8d826181bad2e2 (diff) | |
| download | nova-5012ccb22724c2f7fb0fcdcb7b146d5d5e61337d.tar.gz nova-5012ccb22724c2f7fb0fcdcb7b146d5d5e61337d.tar.xz nova-5012ccb22724c2f7fb0fcdcb7b146d5d5e61337d.zip | |
Merge from trunk, and resolve conflict with nova/auth/ldapdriver.py
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/pip-requires | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/pip-requires b/tools/pip-requires index 17a1a4c5c..e9559521b 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -2,6 +2,7 @@ SQLAlchemy==0.6.3 pep8==0.5.0 pylint==0.19 IPy==0.70 +Cheetah==2.4.2.1 M2Crypto==0.20.2 amqplib==0.6.1 anyjson==0.2.4 @@ -21,3 +22,4 @@ mox==0.5.0 greenlet==0.3.1 nose bzr +Twisted>=10.1.0
\ No newline at end of file |