diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2011-09-17 07:47:45 +0100 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2011-09-17 07:47:45 +0100 |
| commit | 05521b82b5bb381b72319b5b05e03b8eb35af6c8 (patch) | |
| tree | 262e3992846293df6b996189ef875ad9b3fd608c /bin/stack | |
| parent | 0bcfe0b990fb8df799df2c2bb95f324beeccc974 (diff) | |
| parent | 0dc06712aa06a60a582938770a9555b9df90fa22 (diff) | |
| download | nova-05521b82b5bb381b72319b5b05e03b8eb35af6c8.tar.gz nova-05521b82b5bb381b72319b5b05e03b8eb35af6c8.tar.xz nova-05521b82b5bb381b72319b5b05e03b8eb35af6c8.zip | |
Merge trunk to resolve nova/network/linux_net.py conflict
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions