diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-03-24 19:43:09 -0700 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-03-24 19:43:09 -0700 |
| commit | 12f651fe42af16be67cf67d2d6217e183958114e (patch) | |
| tree | 08fc61f0f322ea5a7d3fd49a3fa9d78351f669dc /nova/api | |
| parent | 3b4150caa10786e8312abc11666214a9c3243389 (diff) | |
| parent | d83ec9a667f7b9787a6ad9d7af78069f6d0f2cda (diff) | |
Merge remote branch 'nova/vnc_console' into vnc_console
Conflicts:
nova/virt/libvirt_conn.py
Diffstat (limited to 'nova/api')
0 files changed, 0 insertions, 0 deletions