On Sat, 15 Dec 2012, Joshua Harlow wrote:
> Is it just me or did the merge not go through correctly? > > See: https://bazaar.launchpad.net/~harlowja/cloud-init/ds-reset- > fix/revision/741 > > Looking at the current "head" function for distro() that was supposed to > be different, it doesn't appear to have reflected that merge?? > > https://bazaar.launchpad.net/~cloud-init-dev/cloud- > init/trunk/view/head:/cloudinit/stages.py#L75 > > Possibly thats why :-)
It looks like yo'ure right. Look at my comment in '#' there (the first one). I thought that the issue was not actually real, so I only pulled one piece of the merge.
Thanks for pointing this out. Scott
On Sat, 15 Dec 2012, Joshua Harlow wrote:
> Is it just me or did the merge not go through correctly? /bazaar. launchpad. net/~harlowja/ cloud-init/ ds-reset- /bazaar. launchpad. net/~cloud- init-dev/ cloud- view/head: /cloudinit/ stages. py#L75
>
> See: https:/
> fix/revision/741
>
> Looking at the current "head" function for distro() that was supposed to
> be different, it doesn't appear to have reflected that merge??
>
> https:/
> init/trunk/
>
> Possibly thats why :-)
It looks like yo'ure right.
Look at my comment in '#' there (the first one).
I thought that the issue was not actually real, so I only pulled one piece
of the merge.
Thanks for pointing this out.
Scott