Merge lp:~andatche/cloud-init/freebsd-improvements into lp:~cloud-init-dev/cloud-init/trunk
Proposed by
Ben Arblaster
Status: | Merged |
---|---|
Merged at revision: | 1193 |
Proposed branch: | lp:~andatche/cloud-init/freebsd-improvements |
Merge into: | lp:~cloud-init-dev/cloud-init/trunk |
Prerequisite: | lp:~andatche/cloud-init/freebsd-pkg-support |
Diff against target: |
70 lines (+21/-9) (has conflicts) 2 files modified
cloudinit/distros/freebsd.py (+16/-4) config/cloud.cfg-freebsd (+5/-5) Text conflict in cloudinit/distros/freebsd.py |
To merge this branch: | bzr merge lp:~andatche/cloud-init/freebsd-improvements |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Scott Moser | Pending | ||
Review via email: mp+278427@code.launchpad.net |
To post a comment you must log in.