summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-08-31 21:55:12 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-08-31 21:55:12 -0700
commit6180df0663cbb1b0ff4464f9d66d6acd0a64f5bd (patch)
treecee2f971dd886529f65a6502115d501c18da7fc4 /tools
parent642c9ceb1bae9fa5ba008cb69c47f449ea173c3a (diff)
parente0e98075fc520428033e7ebd11eb68d37a4ca5c8 (diff)
downloadnova-6180df0663cbb1b0ff4464f9d66d6acd0a64f5bd.tar.gz
nova-6180df0663cbb1b0ff4464f9d66d6acd0a64f5bd.tar.xz
nova-6180df0663cbb1b0ff4464f9d66d6acd0a64f5bd.zip
merge trunk, fix tests
Diffstat (limited to 'tools')
-rw-r--r--tools/pip-requires1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/pip-requires b/tools/pip-requires
index 60b502ffd..66d6a48d9 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -8,6 +8,7 @@ anyjson==0.2.4
boto==1.9b
carrot==0.10.5
eventlet
+kombu
lockfile==0.8
lxml==2.3
python-novaclient==2.6.0