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

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/quantal/lxc

Ubuntu branches: Pending requested 2012-08-30

Diff: 653 lines (+608/-0) (has conflicts)

5 files modified

.pc/0204-ubuntu-cloud-userdata-path/templates/lxc-ubuntu-cloud.in (+397/-0)
.pc/0205-lxc-ls-manpage-document-two-lines/doc/lxc-ls.sgml.in (+144/-0)
debian/changelog (+13/-0)
debian/patches/0204-ubuntu-cloud-userdata-path (+30/-0)
debian/patches/0205-lxc-ls-manpage-document-two-lines (+24/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

141. By Serge Hallyn on 2012-08-30

lxc-start-ephemeral: support fedora and centos (LP: #1042431)

140. By Serge Hallyn on 2012-08-30

* 0204-ubuntu-cloud-userdata-path: Fix broken behavior when a relative
  path is passed into '--userdata' argument. (LP: #1043582)
* 0205-lxc-ls-manpage-document-two-lines: Document the default two-line
  output format of lxc-ls. (LP: #1043018)

139. By Stéphane Graber on 2012-08-28

releasing version 0.8.0~rc1-4ubuntu31

138. By Stéphane Graber on 2012-08-28

releasing version 0.8.0~rc1-4ubuntu30

137. By Stéphane Graber on 2012-08-27

Move python-lxc from debian/ to a patch against the upstream tree

136. By Stéphane Graber on 2012-08-27

Fix spelling of Python

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

[ Serge Hallyn ]
* fix lxcapi_start to not return true when it container failed to start.
* 0201-fix-mkdir-race: don't raise error if mkdir fails with EEXIST.
* 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.

[ Stéphane Graber ]
* python-lxc: in get_ips() if timeout is 1 don't wait one second before
  returning.
* python-lxc: Add import time warning that the API isn't yet stable and
  so may change at any point in the future.

134. By Stéphane Graber on 2012-08-22

[ Stéphane Graber ]
* Merge liblxc changes:
  - Build-depend on automake as autogen.sh is now run at build time.
  - Introduce new liblxc0 binary package
  - Make lxc to depend on liblxc0
  - Move library to the new binary package
  - Change libdir to be the public multi-arch path
  - Build with --disable-rpath
  - Move all the test binaries to a lxc-test-* namespace
* Merge python3-lxc changes:
  - Introduce new python3-lxc binary package
  - Update debian/rules to build the python3 code
* Update lxc-start-ephemeral:
  - Replace tabs by 4 spaces, fix indentation
  - Fix code to work properly as non-root (calling sudo where needed)

[ Serge Hallyn ]
* confile.c: support hooks in save_config().
* conf.h: Add array of hook names

133. By Serge Hallyn on 2012-08-21

* Add patches from mailing list to support per-namespace attach with
  lxc-attach.
  - 0104-add-option-to-lxc-attach-to-select-ns
  - 0105-lxc-attach-add-R-option

132. By Serge Hallyn on 2012-08-17

* 0100-template-cleanup-cache: clean up template cache if interrupted
  during build. (LP: #1037331)
* 0101-template-empty-apt-cache: do an apt-cache clean after creating
  a new cache. (LP: #1037626)
* 0102-lxc-start-d-check-privs: exit early (with failure) if starting a
  daemonized container with insufficient privilege. (LP: #918327)
* 0103-make-rootfs-location-optional: allow custom location for a
  container rootfs to be specified. (LP: #1019398)