Merge authors: James Hunt (jamesodhunt) Steve Langasek (vorlon) ------------------------------------------------------------ revno: 1402 [merge] committer: Steve Langasek <[email protected]> branch nick: upstream timestamp: Fri 2012-12-07 12:33:03 -0800 message: Merge 1.6.1 into the history modified: ChangeLog NEWS po/upstart.pot
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog' --- ChangeLog 2012-12-07 18:26:43 +0000 +++ ChangeLog 2012-12-07 20:33:03 +0000 @@ -1,5 +1,10 @@ 2012-12-07 James Hunt <[email protected]> + * NEWS: Release 1.6.1 + * configure.ac: Change version to 1.6.1 + +2012-12-07 James Hunt <[email protected]> + * init/Makefile.am: - TEST_DATA_DIR: use $srcdir, not $PWD. - TEST_DATA_FILES: Corrected filename. === modified file 'NEWS' --- NEWS 2012-11-15 09:43:56 +0000 +++ NEWS 2012-12-07 20:33:03 +0000 @@ -1,5 +1,21 @@ 1.7 xxxx-xx-xx +1.6.1 2012-12-07 "It glows in the dark" + + * Improved re-exec performance. + * Minor logger fixes for unflushed data. + * Handle re-exec scenario when requested from within a chroot. + * Minor serialisation data format change to handle chroots and + user sessions. + * Added extra re-exec tests including explicit upgrade tests reading + from pre-prepared JSON data files. + * Make jobs running within a chroot log their output within the chroot. + * Added "Restart" D-Bus method. + * Changed 'telinit u' to use "Restart" D-Bus method rather than + sending SIGTERM to play nicely when busybox(1) is init. + * Added "GetState" D-Bus method allowing current serialised internal state + to be queried. + 1.6 2012-11-15 "The turbine, the fish and the glass partition" * 'telinit u' now performs a stateful re-exec, allowing Upstart === modified file 'po/upstart.pot' --- po/upstart.pot 2012-11-15 09:39:25 +0000 +++ po/upstart.pot 2012-12-07 20:03:26 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: upstart 1.6\n" +"Project-Id-Version: upstart 1.6.1\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2012-11-15 09:29+0000\n" +"POT-Creation-Date: 2012-12-07 19:53+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -89,6 +89,30 @@ msgid "You do not have permission to notify disk is writeable" msgstr "" +#: init/control.c:987 +msgid "Ignoring state query from chroot session" +msgstr "" + +#: init/control.c:998 +msgid "You do not have permission to request state" +msgstr "" + +#: init/control.c:1011 +msgid "Out of Memory" +msgstr "" + +#: init/control.c:1049 +msgid "Ignoring restart request from chroot session" +msgstr "" + +#: init/control.c:1060 +msgid "You do not have permission to request restart" +msgstr "" + +#: init/control.c:1064 +msgid "Restarting" +msgstr "" + #: init/errors.h:60 msgid "Illegal parameter" msgstr "" @@ -265,7 +289,7 @@ msgid "Job has already been stopped: %s" msgstr "" -#: init/job.c:1823 init/job_class.c:1876 init/job_class.c:1901 +#: init/job.c:1823 init/job_class.c:1889 init/job_class.c:1914 msgid "BUG" msgstr "" @@ -283,15 +307,15 @@ msgid "Unknown instance: %s" msgstr "" -#: init/job_class.c:1877 +#: init/job_class.c:1890 msgid "'start on' parse error" msgstr "" -#: init/job_class.c:1902 +#: init/job_class.c:1915 msgid "'stop on' parse error" msgstr "" -#: init/job_class.c:2210 +#: init/job_class.c:2218 msgid "unable to clear CLOEXEC bit on log fd" msgstr "" @@ -595,7 +619,7 @@ "actually run /sbin/telinit." msgstr "" -#: init/main.c:203 util/reboot.c:166 util/shutdown.c:371 util/telinit.c:148 +#: init/main.c:203 util/reboot.c:166 util/shutdown.c:371 util/telinit.c:248 msgid "Need to be root" msgstr "" @@ -1164,15 +1188,15 @@ msgid "(%s) at %d:%02d ..." msgstr "" -#: util/telinit.c:94 +#: util/telinit.c:194 msgid "set environment variable in the runlevel event" msgstr "" -#: util/telinit.c:115 +#: util/telinit.c:215 msgid "Change runlevel." msgstr "" -#: util/telinit.c:117 +#: util/telinit.c:217 msgid "" "RUNLEVEL should be one of 0123456sS, where s and S are considered " "identical.\n" @@ -1186,12 +1210,12 @@ "state.\n" msgstr "" -#: util/telinit.c:134 +#: util/telinit.c:234 #, c-format msgid "%s: missing runlevel\n" msgstr "" -#: util/telinit.c:139 +#: util/telinit.c:239 #, c-format msgid "%s: illegal runlevel: %s\n" msgstr ""
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
