can you merge with trunk now ? there is one conflict, and what i think you end up needing is just http://paste.ubuntu.com/17386285/ -- https://code.launchpad.net/~harlowja/cloud-init/cloud-init-fix-up-cli/+merge/297409 Your team cloud init development team is requested to review the proposed merge of lp:~harlowja/cloud-init/cloud-init-fix-up-cli into lp:cloud-init.
_______________________________________________ Mailing list: https://launchpad.net/~cloud-init-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
