lp:~jamesodhunt/upstart/upstream-vim-syntax-file-update
- Get this branch:
- bzr branch lp:~jamesodhunt/upstart/upstream-vim-syntax-file-update
Branch merges
Branch information
Recent revisions
- 1311. By James Hunt
-
* contrib/
vim/syntax/ upstart. vim: Updates for kill, oom, expect
and limit.
* Changelog: updated. - 1310. By James Hunt
-
* contrib/
vim/syntax/ upstart. vim: Updated syntax file as now bundled
with Vim distribution. - 1308. By Scott James Remnant (Canonical)
-
* init/job_process.c (job_process_
spawn): Make sure we don't close
our own file descriptor if it already has the right value. - 1307. By James Hunt
-
Merge of lp:~jamesodhunt/upstart/upstream-udev+socket-bridges.
* Makefile.am: Added extra directory.
* New files:
- extra/Makefile.am
- extra/conf/upstart- socket- bridge. conf
- extra/conf/upstart- udev-bridge. conf
- extra/man/socket- event.7
- extra/man/upstart- socket- bridge. 8
- extra/man/upstart- udev-bridge. 8
- extra/upstart-socket- bridge. c
- extra/upstart-udev-bridge. c
* configure.ac:
- Check for udev (for upstart-udev-bridge) .
- Add extra/Makefile to AC_CONFIG_FILES.
* dbus/com.ubuntu. Upstart. xml: Add EmitEventWithFile method.
* init/control.c:
- control_emit_event( ): Now a wrapper for control_ emit_event_ with_file.
- control_emit_event_ with_file( ): New function that operates on an fd.
* init/control.h: Prototype for control_emit_event_ with_file( ).
* init/event.c:
- event_new(): Initialize event fd.
- event_pending_handle_ jobs(): Now calls event_operator_ fds().
* init/event.c: Add fd to Event struct.
* init/event_operator. c: event_operator_ fds(): New function.
* init/event_operator. h: Prototype for event_operator_ fds().
* init/job.c: job_new(): Initialize fd members.
* init/job.h: Add fds and num_fds to Job struct. - 1306. By James Hunt
-
Remerge of lp:~jamesodhunt/upstart/upstream-initctl-check-config for
doc updates. - 1304. By James Hunt
-
Remerge of lp:~jamesodhunt/upstart/upstream-session-support for updated
manual test docs. - 1303. By James Hunt
-
Re-merge of lp:~jamesodhunt/upstart/upstream-override-support.
* init/conf.c: conf_reload(): Back out change where we do not ignore
ENOENT for missing conf files/dirs since this is a non-override file
change.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:upstart