← Back to team overview

cloud-init-dev team mailing list archive

Thread
Date

Re: [Merge] lp:~harlowja/cloud-init/cloud-init-fix-up-cli into lp:cloud-init

To: mp+297409@xxxxxxxxxxxxxxxxxx
From: Scott Moser <smoser@xxxxxxxxxx>
Date: Thu, 16 Jun 2016 00:55:46 -0000
In-reply-to: <20160614215923.4100.53344.launchpad@ackee.canonical.com>
Reply-to: mp+297409@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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.

References

[Merge] lp:~harlowja/cloud-init/cloud-init-fix-up-cli into lp:cloud-init
From: Joshua Harlow, 2016-06-14