[lxc-devel] [lxc/lxc] 431fdc: Update lxc-fedora.in

[Stéphane Graber]

Oops, sorry if I caused a few conflicts with your upcoming patchset...

We had the fedora 19 fix as a pull request on github for a while so I
just applied it when going through the outstanding merge proposals this
morning.

Then git complained about a mixed tab/space in that patch, so I looked
at the file and fixed all of those too, which I guess will be the
largest source of conflicts with your work...

On Wed, Oct 02, 2013 at 12:12:19PM -0400, Michael H. Warfield wrote:
> Ah Crap...  Just when I'm almost done regression testing my updates to
> the lxc-fedora template...
> 
> Stéphane,
> 
> When did this come in?  I thought I had already fixed that version
> gotcha for Fedora 19 (which is now up to -4 in updates) and that it had
> been committed to staging long before Linux Plumbers.  That commit looks
> like it would conflict with the changes I made to generalize that
> release logic and bring some sanity to the retry logic.
> 
> In fact, I was the one that accidentally introduced the tab / space
> inconsistencies also noted in the log and was cleaning those up in my
> bit patch I'm working on now.
> 
> Regards,
> Mike
> 
> On Wed, 2013-10-02 at 08:47 -0700, GitHub wrote: 
> >   Branch: refs/heads/master
> >   Home:   https://github.com/lxc/lxc
> >   Commit: 431fdc427247ab1a6189c46d0743e38f30f9e1e9
> >       https://github.com/lxc/lxc/commit/431fdc427247ab1a6189c46d0743e38f30f9e1e9
> >   Author: Renich Bon Ciric <renich at woralelandia.com>
> >   Date:   2013-10-02 (Wed, 02 Oct 2013)
> > 
> >   Changed paths:
> >     M templates/lxc-fedora.in
> > 
> >   Log Message:
> >   -----------
> >   Update lxc-fedora.in
> > 
> > Fedora 19's release has no -1 revision; it's a -2 revision actually:
> > ftp://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/os/Packages/f/
> > 
> > Signed-off-by: Renich Bon Ciric <renich at woralelandia.com>
> > Acked-by: Stéphane Graber <stgraber at ubuntu.com>
> > 
> > 
> >   Commit: 8983aa6e1e831f690be9cf38ae434a0de8b5107d
> >       https://github.com/lxc/lxc/commit/8983aa6e1e831f690be9cf38ae434a0de8b5107d
> >   Author: Stéphane Graber <stgraber at ubuntu.com>
> >   Date:   2013-10-02 (Wed, 02 Oct 2013)
> > 
> >   Changed paths:
> >     M templates/lxc-fedora.in
> > 
> >   Log Message:
> >   -----------
> >   fedora: Use consistent tab/space indent
> > 
> > Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
> > 
> > 
> > Compare: https://github.com/lxc/lxc/compare/99282c429a23...8983aa6e1e83
> > 
> > ------------------------------------------------------------------------------
> > October Webinars: Code for Performance
> > Free Intel webinars can help you accelerate application performance.
> > Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
> > the latest Intel processors and coprocessors. See abstracts and register >
> > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
> > _______________________________________________
> > Lxc-devel mailing list
> > Lxc-devel at lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/lxc-devel
> 
> -- 
> Michael H. Warfield (AI4NB) | (770) 985-6132 |  mhw at WittsEnd.com
>    /\/\|=mhw=|\/\/          | (678) 463-0932 |  http://www.wittsend.com/mhw/
>    NIC whois: MHW9          | An optimist believes we live in the best of all
>  PGP Key: 0x674627FF        | possible worlds.  A pessimist is sure of it!



-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20131002/49d68a86/attachment.pgp>