resolve conflicts with trunk

Browse Source

...

This commit is contained in:

Anthony Young

2011-06-03 14:41:25 -07:00

parent 5c205bb5ef f903911a07

commit 9ada213e50

73 changed files with 3170 additions and 1350 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1165

nova/tests/test_libvirt.py Normal file

File diff suppressed because it is too large Load Diff