Romanos,
Sorry to keep bothering you :)

Thanks again for your help.

I looked to pull this in, and found that it has merge conflicts
with master.

I've rebased onto master and would just like you to review my
changes.

See https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/339373

With your approval there, I'll merge that.
-- 
https://code.launchpad.net/~rski/cloud-init/+git/cloud-init/+merge/312284
Your team cloud-init commiters is requested to review the proposed merge of 
~rski/cloud-init:puppet_4 into cloud-init:master.

_______________________________________________
Mailing list: https://launchpad.net/~cloud-init-dev
Post to     : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help   : https://help.launchpad.net/ListHelp

Reply via email to