Hi Daniel, You'll find the 0.9~rc1 pull request below.
Based on what you did last time, the following should do the trick: - Review the pull request - Use "git pull --edit --no-ff --stat git://github.com/lxc/lxc.git", that should do a real merge, letting you do a proper Sign-off of the changes. - Update the version number to 0.9~rc1 - Commit and tag Major changes include: - Addition of -P option to all executables (to specify lxcpath) - Rework of the cgroup handling code - Rework of lxc-attach for userns - Updates to the alpine, archlinux, opensuse, oracle and ubuntu templates. Removal of the lenny template. - Introduction of a new lxc.stopsignal option - Introduction of a new lxc.kmsg option - Various userns improvements - New --host option in lxc-ps - Introduction of a few examples lxc hooks - Support for nested containers in lxc-ls - Introduction of get_version in the C API. - And a variety of bugfixes As usual, we've run the regression tests on the current staging branch and all passed. I also test built on both Ubuntu 13.04 and cross-built to Android 4.2. This should be the last milestone before final 0.9, unless we notice that some major rework is needed at the last minute and warrants a second rc. Thanks to everyone involved! Stéphane --------- The following changes since commit 64e9369c8f82ef9256388726b77b20f042a54809: version 0.9.0-alpha2 (2013-02-18 08:48:32 +0100) are available in the git repository at: git://github.com/lxc/lxc.git staging for you to fetch changes up to f424fa8f3ed5883c5624cf0a494537a5ec912d35: Add missing config.h includes. (2013-03-13 23:26:55 -0400) ---------------------------------------------------------------- Alexander Vladimirov (3): Add lxc.stopsignal config option Make /dev/kmsg symlinking optional, add lxc.kmsg option Update lxc-archlinux template default config to use new options Anthony Wu (1): Update README w/ libcap troubleshooting tip. Christian Seiler (4): lxc_attach: fix break with user namespaces (v3) lxc-attach: Try really hard to determine login shell lxc-attach: Default to /bin/sh if shell cannot be determined or exec'd lxc-attach: User namespaces: Use init's user & group id when attaching Dwight Engen (8): only INFO rcfile if asprintf successfully allocates it legacy ls: only output appropriate directories/containers include hook files in make dist ensure clock_gettime symbol is found include tests in make dist make [ug]id map ordering consistent with /proc/<nr>/[ug]id_map oracle template: fixes for older releases uidmap: fix writing multiple ranges Frederic Crozat (4): various fixes for openSUSE template for lxc-clone usage shutdown fixes for openSUSE container give a hint if old cgroup can't be moved lxc-opensuse: update for 12.2 Jiri Slaby (3): lxc-opensuse: extend base lxc-opensuse: proper failure lxc-opensuse: print \n from one echo Jäkel, Guido (1): A new option '--host' for lxc-ps Natanael Copa (2): lxc-alpine: autodetect standard bridges and set hwaddress configure: replace deprecated AM_CONFIG_HEADER Serge Hallyn (19): lxc_monitor_open: prepend lxcpath remove redundant, too-early call to clearenv in api_start call. templates: update for openSUSE 12.3 attach: join apparmor profile lxc-destroy: add --lxc-path argument af_unix: make sure to keep useful errno userns: handle delayed write errors at fclose c api -> createl: correctly handle 0 template args c api: send lxcpath to destroy command cgroup: improve support for multiple lxcpaths (v3) lxc-destroy man page: document --lxcpath option attach: free result before potentially strduping a second time. attach: handle apparmor transitions in !NEWNS cases rootfs pin: fix two bugs cgroup: try to set clone_children cgroups: don't mount under init's cgroup default kmsg symlinking to on, and document lxc.kmsg lxc_id_mapping: don't try to write mappings if there are none commands.c: sanity check to not write too-long cgroup path name Stéphane Graber (13): Introduce --lxcpath cmdline option, and make default_lxc_path() return const char * Use AC_SEARCH_LIBS instead of hardcoded lists Fix typos identified by lintian lxc-ubuntu{-cloud}: Config layout tweaking Add example hooks from Ubuntu package python: Update the python scripts for lxcpath lxc-ls: Implement support for nested containers python api_test: Drop use of @LXCPATH@ python: Don't hardcode LXCPATH in python module API: export lxc_get_version() python: Add get_version to binding lxc-lenny: Remove deprecated template Add missing config.h includes. .gitignore | 3 - Makefile.am | 4 +- README | 13 +++ configure.ac | 14 ++- doc/common_options.sgml.in | 9 ++ doc/lxc-destroy.sgml.in | 9 ++ doc/lxc-ls.sgml.in | 12 +++ doc/lxc-ps.sgml.in | 13 +++ doc/lxc.conf.sgml.in | 72 +++++++++++--- hooks/Makefile.am | 7 ++ hooks/mountcgroups | 44 +++++++++ hooks/mountecryptfsroot | 50 ++++++++++ src/lua-lxc/core.c | 3 +- src/lxc/Makefile.am | 14 +-- src/lxc/af_unix.c | 6 ++ src/lxc/apparmor.c | 105 +++++++++++++++----- src/lxc/apparmor.h | 22 ++++- src/lxc/arguments.c | 4 + src/lxc/arguments.h | 2 + src/lxc/attach.c | 206 ++++++++++++++++++++++++++++++++++++++- src/lxc/attach.h | 5 + src/lxc/cgroup.c | 924 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------- src/lxc/cgroup.h | 18 ++-- src/lxc/commands.c | 19 +++- src/lxc/commands.h | 3 + src/lxc/conf.c | 68 +++++++++---- src/lxc/conf.h | 22 +++-- src/lxc/confile.c | 112 +++++++++++++++++++++- src/lxc/freezer.c | 45 ++++++--- src/lxc/legacy/lxc-ls.in | 9 +- src/lxc/log.c | 2 +- src/lxc/lxc-create.in | 11 ++- src/lxc/lxc-destroy.in | 20 ++-- src/lxc/lxc-device | 6 +- src/lxc/lxc-ls | 78 +++++++++++++-- src/lxc/lxc-ps.in | 13 ++- src/lxc/lxc-start-ephemeral.in | 14 ++- src/lxc/lxc.h | 42 +++++--- src/lxc/lxc_attach.c | 229 +++++++++++++++++++++++++++++++++++++------- src/lxc/lxc_cgroup.c | 4 +- src/lxc/lxc_console.c | 4 +- src/lxc/lxc_execute.c | 10 +- src/lxc/lxc_freeze.c | 2 +- src/lxc/lxc_info.c | 6 +- src/lxc/lxc_kill.c | 4 +- src/lxc/lxc_monitor.c | 2 +- src/lxc/lxc_restart.c | 10 +- src/lxc/lxc_start.c | 14 +-- src/lxc/lxc_stop.c | 6 +- src/lxc/lxc_unfreeze.c | 2 +- src/lxc/lxc_unshare.c | 10 -- src/lxc/lxc_wait.c | 2 +- src/lxc/lxccontainer.c | 40 ++++---- src/lxc/lxccontainer.h | 3 +- src/lxc/lxcutmp.c | 2 +- src/lxc/monitor.c | 36 +++++-- src/lxc/monitor.h | 5 +- src/lxc/restart.c | 5 +- src/lxc/start.c | 60 ++++++++++-- src/lxc/start.h | 5 +- src/lxc/state.c | 13 ++- src/lxc/state.h | 2 +- src/lxc/stop.c | 9 +- src/lxc/utils.c | 19 ++-- src/lxc/utils.h | 2 +- src/lxc/version.h | 31 ++++++ src/python-lxc/examples/{api_test.py.in => api_test.py} | 3 +- src/python-lxc/lxc.c | 22 ++++- src/python-lxc/lxc/{__init__.py.in => __init__.py} | 25 ++--- src/tests/Makefile.am | 21 +++- src/tests/cgpath.c | 164 +++++++++++++++++++++++++++++++ src/tests/lxcpath.c | 2 +- templates/Makefile.am | 1 - templates/lxc-alpine.in | 38 ++++++-- templates/lxc-archlinux.in | 4 +- templates/lxc-lenny.in | 317 ------------------------------------------------------------ templates/lxc-opensuse.in | 149 ++++++++++++++++------------- templates/lxc-oracle.in | 132 +++++++++++++++---------- templates/lxc-ubuntu-cloud.in | 14 +-- templates/lxc-ubuntu.in | 11 +-- 80 files changed, 2139 insertions(+), 1324 deletions(-) create mode 100644 hooks/Makefile.am create mode 100755 hooks/mountcgroups create mode 100755 hooks/mountecryptfsroot create mode 100644 src/lxc/version.h rename src/python-lxc/examples/{api_test.py.in => api_test.py} (98%) rename src/python-lxc/lxc/{__init__.py.in => __init__.py} (96%) create mode 100644 src/tests/cgpath.c delete mode 100644 templates/lxc-lenny.in -- Stéphane Graber Ubuntu developer http://www.ubuntu.com
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel