summaryrefslogtreecommitdiffstats
path: root/tools/pip-requires
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-12-16 22:52:08 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2010-12-16 22:52:08 +0000
commit26ebccc8d92aba23efa1663fe9949c141a4cc671 (patch)
treeb5c5724d1f806051ffd30b9a8596c52f6a890351 /tools/pip-requires
parentdc29400d104d34c6383132a43e018f7724e85ec3 (diff)
parentcd460a1f661eea7e050891f50a8218fdf24f2c6f (diff)
downloadnova-26ebccc8d92aba23efa1663fe9949c141a4cc671.tar.gz
nova-26ebccc8d92aba23efa1663fe9949c141a4cc671.tar.xz
nova-26ebccc8d92aba23efa1663fe9949c141a4cc671.zip
merged trunk, fixed conflicts and tests
Diffstat (limited to 'tools/pip-requires')
-rw-r--r--tools/pip-requires2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/pip-requires b/tools/pip-requires
index 548073326..52451b8cb 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -20,3 +20,5 @@ mox==0.5.0
-f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz
greenlet==0.3.1
nose
+bzr
+Twisted>=10.1.0 \ No newline at end of file