diff options
| author | Dan Wendlandt <dan@nicira.com> | 2011-08-12 17:33:30 -0700 |
|---|---|---|
| committer | Dan Wendlandt <dan@nicira.com> | 2011-08-12 17:33:30 -0700 |
| commit | 86d2109b8f3b27e460aa41c11924166cb07d7bb4 (patch) | |
| tree | 99b79011748fc0b67df507db103779237caa40a9 /tools | |
| parent | 18f09f165b5dca5f11253b143045b2ff7327532d (diff) | |
| parent | fe0bde67193ce76376e72a7263b89240a63722a8 (diff) | |
| download | nova-86d2109b8f3b27e460aa41c11924166cb07d7bb4.tar.gz nova-86d2109b8f3b27e460aa41c11924166cb07d7bb4.tar.xz nova-86d2109b8f3b27e460aa41c11924166cb07d7bb4.zip | |
merge in trunk, resolving conflicts with ttx's branch to switch from using sudo to run_as_root=True
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/pip-requires | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/pip-requires b/tools/pip-requires index 23e707034..60b502ffd 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -9,7 +9,8 @@ boto==1.9b carrot==0.10.5 eventlet lockfile==0.8 -python-novaclient==2.5.9 +lxml==2.3 +python-novaclient==2.6.0 python-daemon==1.5.5 python-gflags==1.3 redis==2.0.0 |