diff options
| author | Dan Wendlandt <dan@nicira.com> | 2011-08-01 18:14:27 -0700 |
|---|---|---|
| committer | Dan Wendlandt <dan@nicira.com> | 2011-08-01 18:14:27 -0700 |
| commit | f51958a2aa811b9eb9dd3da0acf5a50e41666810 (patch) | |
| tree | c769b24c212c5b2abb217bc9398fbf1ec4f8b3a8 /bin/stack | |
| parent | 873aad92944f8840e772d65eda4b3320d65a9ce7 (diff) | |
| parent | bdcfaa5b927a096f507fb0f7e2d81989173957f8 (diff) | |
| download | nova-f51958a2aa811b9eb9dd3da0acf5a50e41666810.tar.gz nova-f51958a2aa811b9eb9dd3da0acf5a50e41666810.tar.xz nova-f51958a2aa811b9eb9dd3da0acf5a50e41666810.zip | |
merge trunk, resolve conflict in net/manater.py in favor of vif-plug
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions