Diffusion Pacemaker 8c96179beec1

Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
8c96179beec1
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Apr 26 2015, 7:39 PM

Parents

rP199380dffd52: Merge pull request #686 from HideoYamauchi/1.1
rPdaaacf298d26: Fix: corosync: Bug cl#5232 - Somewhat gracefully handle nodes with invalid UUIDs

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

199380dffd52 Merge pull request #686 from HideoYamauchi/1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e1f829449237 Merge pull request #692 from davidvossel/promote-restart-fix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9a98641b3938 Low: pengine: update regression tests to account for promote restart fix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9b0a3a6b0bad High: pengine: restart master instances on instance attribute changes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f46580f2a3b5 Merge pull request #691 from davidvossel/spec-fix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
ad1e463462a1 Merge pull request #690 from davidvossel/pid-kill-fix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e9f67626c6e3 Low: spec: move report.common and report.collector to cli package
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
91173c4f59ce High: services: Increment lib service's current version to indicate a new…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7a9eca4743ee High: common: Increment current and age for lib common as a result of APIs…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
546766129543 High: pengine: only kill process group on timeout when on-fail does not equal…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7e609c196374 Low:Support of the start from systemd of crm_mon.(3)
Author
HideoYamauchi
Browse Repository
No Audits
51d894c5e3b5 Low:Support of the start from systemd of crm_mon.(2)
Author
HideoYamauchi
Browse Repository
No Audits
50336e6b9f47 Low:Support of the start from systemd of crm_mon.(1)
Author
HideoYamauchi
Browse Repository
No Audits

Changes (20)

Path

Size

include/

crm/

common/

lib/

common/

lrmd/

pengine/

services/

services_linux.c

lrmd/

mcp/

pacemaker.service.in

pacemaker.spec.in

pengine/

test10/

tools/

crm_mon.service.in

rP8c96179beec1

configure.ac

Loading...

include/crm/common/mainloop.h

Loading...

include/crm/services.h

Loading...

lib/common/Makefile.am

Loading...

lib/common/mainloop.c

Loading...

lib/lrmd/lrmd_client.c

Loading...

lib/pengine/utils.c

Loading...

lib/services/Makefile.am

Loading...

lib/services/services.c

Loading...

lib/services/services_linux.c

Loading...

lrmd/lrmd.c

Loading...

mcp/pacemaker.service.in

Loading...

pacemaker.spec.in

Loading...

pengine/allocate.c

Loading...

pengine/test10/bug-1572-2.xml

Loading...

pengine/test10/master-5.xml

Loading...

pengine/test10/master-6.xml

Loading...

tools/Makefile.am

Loading...

tools/crm_mon.service.in

Loading...

tools/crm_resource.c

Loading...