Merge lp://staging/~zulcss/nova/nova-lp-749973 into lp://staging/~hudson-openstack/nova/trunk
Proposed by
Chuck Short
| Status: | Merged |
|---|---|
| Approved by: | Jay Pipes |
| Approved revision: | 943 |
| Merged at revision: | 944 |
| Proposed branch: | lp://staging/~zulcss/nova/nova-lp-749973 |
| Merge into: | lp://staging/~hudson-openstack/nova/trunk |
| Diff against target: |
13 lines (+2/-1) 1 file modified
nova/virt/libvirt_conn.py (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~zulcss/nova/nova-lp-749973 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jay Pipes (community) | Approve | ||
| Vish Ishaya (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch contains the fix for lp:749973. VNC is assumed that is default for all in libvirt which LXC does not support yet.
Regards
chuck
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
personally I would have done this with an and in the if, but it is more just a style preference so I won't block the merge on that.