[lxc-devel] Cherry-picking to stable-1.0

[Stéphane Graber]

Hello,

I intend to release 1.0.4 next week and am currently going through all
the commits in master which should be included in the bugfix release.

Most of them applied cleanly except for two:
 - [PATCH] Convert punctuation marks in Japanese man pages
   This one we thought was identical for both branches, this turned out
   to be wrong, so instead of cherry-picking from master, I applied the one
   from the stable-1.0 pull request I was sent.
 - [PATCH] lxc-oracle: fix warnings/errors from some rpm scriptlets
   This one fails to apply on current stable-1.0, probably because of
   the changes done to the Oracle template to support installing from
   media. If those fixes should be backported to stable, I'd appreciate
   receiving a separate patch for that.


I've also gone through all the patches that have been stacking in my
mailbox, at the moment, the only unreviewed patches in there are the
menuconfig change. If you submitted something else and it's not in
master now, please re-send.

Thanks!

-- 
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: 819 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20140430/31aa496f/attachment.sig>