summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDan Wendlandt <dan@nicira.com>2011-09-07 14:27:06 -0700
committerDan Wendlandt <dan@nicira.com>2011-09-07 14:27:06 -0700
commit0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc (patch)
tree0ee3f8a60147da042b0b14db350a320228876fa6 /tools
parente5e3b306985a3b1fdd8a971f48b76eaf8f923f21 (diff)
parent3e0698e3b57c9f73a359340f51c2797d8adc669a (diff)
downloadnova-0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc.tar.gz
nova-0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc.tar.xz
nova-0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc.zip
merge trunk
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