diff options
| author | Todd Willey <todd@rubidine.com> | 2010-07-14 19:32:07 -0400 |
|---|---|---|
| committer | Todd Willey <todd@rubidine.com> | 2010-07-14 19:32:07 -0400 |
| commit | b01f71ae7ba387a5e7ff2c6ad4a4775f9ab6e22b (patch) | |
| tree | b44acd06b38171b1492fe44a536c2b067b163b79 /bin/stack | |
| parent | 6bba6d3b7c63054acf7828cba7eb87b0f1d84d1c (diff) | |
| parent | 5e8337aec03f5a697c90779eb66a457aae4e7ae0 (diff) | |
Merge branch 'master' into apply_api
Conflicts:
nova/compute/node.py
nova/volume/storage.py
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions