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

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/quantal/lxc

Ubuntu branches: Pending requested 2012-09-14

Diff: 5346 lines (+5305/-0) (has conflicts)

6 files modified

.pc/0220-getitem-per-hook-type/src/lxc/conf.c (+2522/-0)
.pc/0220-getitem-per-hook-type/src/lxc/conf.h (+262/-0)
.pc/0220-getitem-per-hook-type/src/lxc/confile.c (+1673/-0)
.pc/0221-make-nonflush-upgrades-robust/templates/lxc-ubuntu.in (+713/-0)
debian/patches/0220-getitem-per-hook-type (+84/-0)
debian/patches/0221-make-nonflush-upgrades-robust (+51/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

167. By Serge Hallyn on 2012-09-14

add DEP5 tags to 0220. Release.

166. By Serge Hallyn on 2012-09-14

add ; after 'false'

165. By Serge Hallyn on 2012-09-14

undo the fedora update.

164. By Serge Hallyn on 2012-09-14

0222-update-fedora-template: update the download links in the fedora
template (LP: #1005951)

163. By Serge Hallyn on 2012-09-14

0221-make-nonflush-upgrades-robust: be more robust about out of date
container caches. (LP: #942862)

162. By Serge Hallyn on 2012-09-14

fix off by one in check for subhook.

161. By Serge Hallyn on 2012-09-14

update a caller of lxc_clear_hooks() which i missed before.

160. By Serge Hallyn on 2012-09-14

0220-getitem-per-hook-type: support clear_item for specific hooks.
(LP: #1050719)

159. By Serge Hallyn on 2012-09-13

releasing version 0.8.0~rc1-4ubuntu34

158. By Serge Hallyn on 2012-09-13

debian/rules: remove parsing of apparmor.in files.