Merge authors: James Hunt (jamesodhunt) ------------------------------------------------------------ revno: 1481 [merge] committer: James Hunt <[email protected]> branch nick: upstart timestamp: Thu 2013-06-20 13:39:49 +0100 message: * Merge of merge lp:~jamesodhunt/upstart/bug-1190526. modified: ChangeLog init/quiesce.c
-- 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 2013-06-20 09:34:34 +0000 +++ ChangeLog 2013-06-20 12:33:09 +0000 @@ -1,3 +1,8 @@ +2013-06-20 James Hunt <[email protected]> + + * init/quiesce.c: quiesce_show_slow_jobs(): Don't free static string + (LP: #1190526). + 2013-06-05 James Hunt <[email protected]> * init/tests/data/upstart-1.8+apparmor.json: New test data file. === modified file 'init/quiesce.c' --- init/quiesce.c 2013-02-08 16:15:23 +0000 +++ init/quiesce.c 2013-06-20 12:33:09 +0000 @@ -216,8 +216,8 @@ /* Note that instances get killed in a random order */ NIH_HASH_FOREACH (class->instances, job_iter) { - nih_local const char *name = NULL; - Job *job; + const char *name; + Job *job; job = (Job *)job_iter;
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
