Diffusion Pacemaker 6afb2d51a3c8

Merge branch 'lrmd-upstart'
6afb2d51a3c8
Actions

Description

Merge branch 'lrmd-upstart'

Conflicts:
include/crm/lrmd.h
lib/lrmd/lrmd_client.c
lrmd/lrmd.c
lrmd/test.c

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Jun 26 2012, 6:26 AM

Parents

rP22efc799bec2: Medium: tools: crm_resource - Support metadata querying
rP60c722c89286: Low: Remove the remaining uses of crm_malloc/crm_free

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

22efc799bec2 Medium: tools: crm_resource - Support metadata querying
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c9bfb0278d60 Medium: lrmd: Support systemd and upstart metadata queries from the lrmd API
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
626420e2da6d Low: services: Support operations that can block forever
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6929cee512c1 crm_resource fix
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
29751a876348 High: services: Strip the path prefix from upstart job lists
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
44a588aaba70 Low: Tools: crm_resource - add support for querying the list of supported…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0c4fc8227577 Low: services: Automatically remap monitor->status when appropriate
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
10e7ea559e22 Low: Core: Support unaliased long options for CLI tools
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e1e3c48a6a4a Low: Build: Add headers to the dist tarball
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
cddfe445afa3 Medium: lrmd: Add API call for listing supported standards
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d21fe155194e systemd sync fix
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
07c8815f054e upstart sync fix
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b2db4d77c39f Medium: services: More reliably detect if upstart and/or systemd are supported…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9e24b260b712 High: services: Support Asynchronous upstart/DBus actions
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8d82e42a8895 High: services: Support Asynchronous systemd/DBus actions
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4a065e7ece89 Medium: services: Use the GDBus API for talking to systemd and upstart
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ded016f555a5 Medium: services: Implement an alternate systemd bridge that uses the GDBus API
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ae964abbebad High: services: 'service' should expand to the correct standard instead of…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
79683268086e Low: service: Convert upstart to the GDBus API
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
89418e6a842d High: lrmd: Add support for upstart services
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4af076e0b399 Low: services: Massage the upstart functionality to be suitable for use in…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
3113bdaf650d Low: services: Import upstart functionality from cluster-glue
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b7a8f3d7a34d Low: Build: Add missing header to automake
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4e66f4ed08e7 Low: Remove the remaining uses of crm_malloc/crm_free
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
bbba79260d9d Low: lrmd: Indention fixes for lrmd, tabs to spaces.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (18)

Path

Size

configure.ac

include/

crm/

Makefile.am

common/

util.h

lrmd.h

lib/

common/

lrmd/

services/

	lib/	services/
		crmd/

	systemd.h
	crmd_lrm.h

lrmd/

tools/

rP6afb2d51a3c8

View Options

configure.ac

View Options

include/crm/Makefile.am

View Options

include/crm/common/util.h

View Options

include/crm/lrmd.h

View Options

lib/common/utils.c

View Options

lib/lrmd/lrmd_client.c

View Options

lib/services/Makefile.am

View Options

lib/services/services.c

View Options

lib/services/services_linux.c

View Options

lib/services/services_private.h

View Options

lib/services/systemd.c

View Options

lib/services/systemd.h

View Options

lib/services/upstart.c

View Options

lib/services/upstart.h

View Options

lrmd/lrmd.c

View Options

lrmd/test.c

View Options

tools/Makefile.am

View Options

Merge branch 'lrmd-upstart'6afb2d51a3c8Actions

Description

Details

Event Timeline

Merged Changes

Changes (18)

rP6afb2d51a3c8

configure.ac

include/crm/Makefile.am

include/crm/common/util.h

include/crm/lrmd.h

lib/common/utils.c

lib/lrmd/lrmd_client.c

lib/services/Makefile.am

lib/services/services.c

lib/services/services_linux.c

lib/services/services_private.h

lib/services/systemd.c

lib/services/systemd.h

lib/services/upstart.c

lib/services/upstart.h

lrmd/lrmd.c

lrmd/test.c

tools/Makefile.am

tools/crm_resource.c

Merge branch 'lrmd-upstart'
6afb2d51a3c8
Actions