diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-03-23 17:23:04 -0700 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-03-23 17:23:04 -0700 |
| commit | 61b52830cdce9ac5ec75d744f07764e535bcae35 (patch) | |
| tree | ef57d0b805be6fa91522f863988ea420f911da56 /bin/instance-usage-audit | |
| parent | 6912b0e1efd6ba3814d3b29beef236bfe4da52ea (diff) | |
| parent | 85ad729e4448bb4211b79e325cef897fc4e2b0bb (diff) | |
Merge branch 'vnc_console' of git://github.com/sleepsonthefloor/nova into vnc_console
Conflicts:
nova/virt/libvirt_conn.py
Diffstat (limited to 'bin/instance-usage-audit')
0 files changed, 0 insertions, 0 deletions