diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-28 15:58:06 +0100 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-28 15:58:06 +0100 |
| commit | a92b6d01c1b0ff5a3b6a79fd974ca993421c9574 (patch) | |
| tree | 87ad7891dac6586ca43a7c9dc3ee3fa4a56bc2ec /nova/adminclient.py | |
| parent | 381354babab58688458b2a6cdc463eb0a0fee461 (diff) | |
| parent | 8501cd94e3929918fdbfe0ca489304449f2f7fe3 (diff) | |
merge trunk, fixed conflicts
Diffstat (limited to 'nova/adminclient.py')
0 files changed, 0 insertions, 0 deletions