lp:~ubuntu-branches/ubuntu/oneiric/lxc/oneiric-201108112013

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/oneiric/lxc

Didier Roche-Tolomelli: Disapprove on 2011-09-08

Ubuntu branches: Pending requested 2011-09-02

Diff: 11197 lines (+11072/-0) (has conflicts)

18 files modified

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/0015-monitor-support-quit.patch/src/lxc/arguments.h (+89/-0)
.pc/0015-monitor-support-quit.patch/src/lxc/lxc_monitor.c (+109/-0)
.pc/01-libdir.patch/configure (+6620/-0)
.pc/01-libdir.patch/configure.ac (+190/-0)
.pc/01-libdir.patch/src/lxc/Makefile.am (+134/-0)
.pc/01-libdir.patch/src/lxc/Makefile.in (+1345/-0)
.pc/02-distclean.patch/config/Makefile.am (+2/-0)
.pc/02-distclean.patch/config/Makefile.in (+343/-0)
.pc/03-module-init-tools.patch/templates/lxc-debian.in (+319/-0)
.pc/04-configuration-path.patch/src/lxc/lxc-create.in (+186/-0)
.pc/06-debian.patch/templates/lxc-debian.in (+320/-0)
.pc/07-debian2.patch/templates/lxc-debian.in (+332/-0)
.pc/applied-patches (+7/-0)
src/lxc/lxc-clone.in (+208/-0)
templates/lxc-opensuse.in (+368/-0)
templates/lxc-ubuntu.in (+498/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

36. By Stéphane Graber on 2011-08-11

Remove files that shouldn't exist anymore

35. By Stéphane Graber on 2011-08-11

Remove all patches that aren't applied anymore

34. By Stéphane Graber on 2011-08-11

Merge branch from Serge Hallyn

33. By Stéphane Graber on 2011-08-11

Update changelog

32. By Stéphane Graber on 2011-08-11

Re-apply all patches

31. By Stéphane Graber on 2011-08-11

Merge 0.7.5

30. By Stéphane Graber on 2011-08-11

Unapply all patches

29. By Serge Hallyn on 2011-08-03

* Add lxc-start-ephemeral by Robert Collins (LP: #807351)
* Add a --quit-on-stop arg to lxc-monitor for use by lxc-start-ephemeral.
* Modify lxcguest.conf to clear out /var/run (LP: #819621)
* Fix a bug in lxc-ps when cgroup-bin is not mounted.
* Modify lxc-ps to accept '-n name' and support '--' to separate options
  for ps. (LP: #820720)

28. By Serge Hallyn on 2011-08-01

* debian/patches/0011-fix-lxc-ls.patch:
  debian/patches/0012-fix-lxc-netstat.patch:
  The cgroup mounts created by cgroup-bin do not show up in /etc/mtab.
  lxc-ls and lxc-netstat, as lxc-ps before, assume that /etc/mtab is
  symlinked to /proc/mounts. (LP: #819319)
* debian/patches/0013-unshare-call-cgroup-create.patch:
  Don't spit out an error when there is no cgroup to remove because the
  ns cgroup is not mounted. (LP: #819319)

27. By Serge Hallyn on 2011-07-28

debian/patches/0010-fix-shutdown.patch: If /var/run is a symlink to /run
in the container, then opening /proc/<pid>/root/var/run/utmp will end up
opening the host's utmp. Therefore the hack detecting shutdown through
utmp fails. (LP: #817565)