lp:~ubuntu-branches/ubuntu/quantal/lxc/quantal-201208251712

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/quantal/lxc

Ubuntu branches: Pending requested 2012-08-25

Diff: 1933 lines (+1700/-188) (has conflicts)

6 files modified

.pc/0201-fix-mkdir-race/src/lxc/cgroup.c (+669/-0)
.pc/0202-make-api-start-reliable/src/lxc/lxccontainer.c (+905/-0)
debian/changelog (+44/-17)
debian/local/lxc-wait (+0/-171)
debian/patches/0201-fix-mkdir-race (+24/-0)
debian/patches/0202-make-api-start-reliable (+58/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

146. By Stéphane Graber on 2012-08-25

Get rid of debian/local/lxc-wait

145. By Stéphane Graber on 2012-08-25

releasing version 0.8.0~rc1-4ubuntu29

144. By Stéphane Graber on 2012-08-25

Fix get_ips() timeout and add import time warning

143. By Serge Hallyn on 2012-08-24

move fn up before use.

142. By Serge Hallyn on 2012-08-24

add needed fn prototype before use.

141. By Serge Hallyn on 2012-08-24

0202-make-api-start-reliable: have daemonized start through the api
wait until the container is RUNNING before returning true. If a 5
second timeout is hit before the container is RUNNING, return false.

140. By Serge Hallyn on 2012-08-24

rename 201-fix-mkdir-race to 0201-fix-mkdir-race

139. By Serge Hallyn on 2012-08-24

add missing directories for new patch.
reset pocket to unreleased for push to parent

138. By Serge Hallyn on 2012-08-24

set version and release pocket for ppa build.

137. By Serge Hallyn on 2012-08-24

201-fix-mkdir-race: don't raise error if mkdir fails with EEXIST.