Diffusion Pacemaker 71042fc9476c

Merge branch 'new_lrmd' of https://github.com/davidvossel/pacemaker
71042fc9476c
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'new_lrmd' of https://github.com/davidvossel/pacemaker

Conflicts:
crmd/lrm.c
include/crm/common/util.h
include/crm/transition.h
lib/common/mainloop.c
lib/common/utils.c
lib/transition/unpack.c
tools/crm_inject.c

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Jun 6 2012, 1:58 AM

Parents

rP6f8f5594a940: High: crmd: Enable use of new lrmd daemon and client library in crmd.
rPb3a09ead9925: Low: ipc: Fix and improve trace message

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

6f8f5594a940 High: crmd: Enable use of new lrmd daemon and client library in crmd.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
2d2a6b871127 High: lrmd: Introducing lrmd regression tests.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
4963384b3ca9 High: lrmd: Introducing the new LRMD daemon and client library
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
cc2110d7ad85 High: services: Introducing the services library.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (60)

Path

Size

crmd/

crmd_callbacks.h

crmd_messages.h

extra/

resources/

include/

crm/

common/

lib/

cib/

common/

raexecstonith.c

services_linux.c

services_private.h

transition/

mcp/

pacemaker.spec.in

pengine/

tools/

xml/

resources-1.1.rng

rP71042fc9476c

Makefile.am

Loading...

configure.ac

Loading...

crmd/Makefile.am

Loading...

crmd/callbacks.c

Loading...

crmd/control.c

Loading...

crmd/crmd_callbacks.h

Loading...

crmd/crmd_fsa.h

Loading...

crmd/crmd_lrm.h

Loading...

crmd/crmd_messages.h

Loading...

crmd/crmd_utils.h

Loading...

crmd/fsa.c

Loading...

crmd/lrm.c

Loading...

crmd/messages.c

Loading...

crmd/misc.c

Loading...

crmd/te_actions.c

Loading...

crmd/te_callbacks.c

Loading...

crmd/te_events.c

Loading...

crmd/tengine.h

Loading...

extra/resources/Dummy

Loading...

include/crm/common/mainloop.h

Loading...

include/crm/common/util.h

Loading...

include/crm/lrmd.h

Loading...

include/crm/services.h

Loading...

include/crm/transition.h

Loading...

lib/Makefile.am

Loading...

lib/cib/cib_private.h

Loading...

lib/common/mainloop.c

Loading...

lib/common/utils.c

Loading...

lib/lrmd/Makefile.am

Loading...

lib/lrmd/lrmd_client.c

Loading...

lib/plugins

Loading...

lib/plugins/Makefile.am

Loading...

lib/plugins/lrm

Loading...

lib/plugins/lrm/Makefile.am

Loading...

lib/plugins/lrm/raexecstonith.c

Loading...

lib/services/Makefile.am

Loading...

lib/services/services.c

Loading...

lib/services/services_linux.c

Loading...

lib/services/services_private.h

Loading...

lib/transition/unpack.c

Loading...

lrmd/Makefile.am

Loading...

lrmd/lrmd.c

Loading...

lrmd/lrmd_private.h

Loading...

lrmd/main.c

Loading...

lrmd/regression.py

Loading...

lrmd/test.c

Loading...

mcp/pacemaker.c

Loading...

pacemaker.spec.in

Loading...

pengine/native.c

Loading...

pengine/pengine.h

Loading...

tools/Makefile.am

Loading...

tools/cib_shadow.c

Loading...

tools/cibadmin.c

Loading...

tools/crm_inject.c

Loading...

tools/crm_mon.c

Loading...

tools/crm_resource.c

Loading...

xml/resources-1.1.rng

Loading...