Diffusion Pacemaker 3e93bc1dd6c1

Merge branch 'master' of github.com:ClusterLabs/pacemaker
3e93bc1dd6c1
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'master' of github.com:ClusterLabs/pacemaker

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Mar 25 2015, 10:17 PM

Parents

rPc883063f3454: Merge pull request #669 from davidvossel/pcmk-docker-bff
rPf92f6b9591a0: Log: services: Be more generous when trace logging the RA output

Branches

Unknown

Tags

Unknown

References

tag: Pacemaker-1.1.13-rc1

Event Timeline

Merged Changes

c883063f3454 Merge pull request #669 from davidvossel/pcmk-docker-bff
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c0f63949b4cf Merge pull request #668 from kgaillot/mon
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7302cd7e6377 Low: lrmd: preserve exit reason string when isolation wrappers are in use
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
48838111981b Fix: docker-wrapper: properly separate docker and resource specific attributes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9726f76889f1 Low: docker-wrapper: set authkey file permissions and properly set container…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
83c3a49aeb53 Low: rename pacemaker_remote_ctl to lrmd_interal_ctl
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
338311455b64 High: lrmd: enable ipc proxy for docker-wrapper privileged mode
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
23ce0371879c Low: enable logging in remote_ctl.c
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
757f110d4dbd Low: lrmd: properly handle poke requests in lrmd client when using ipc
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f2e957ba710a Low: spec: add docker-wrapper directory to spec file
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
2244aafa3798 High: pengine: disable migrations for resources with isolation containers
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7770e0a57df1 Low: pengine: regression tests for disable reload during isolation
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a736fbaa367e High: pengine: disable reloading of resources within isolated container wrappers
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5cdb4bb9ed36 Low: pengine: isolation regression tests
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
eb74798c41f7 High: pengine: ability to launch resources in isolated containers
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
c7d3f0c8c5b2 High: extra: docker container tech wrapper script for pcmk remote
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b2ae244cafee tools: crm_mon prints Stopped clones only if --inactive was specified
Author
kgaillot
Browse Repository
No Audits
1c761c38ca45 tools: display node names more consistently in crm_mon output
Author
kgaillot
Browse Repository
No Audits
d5934b96ea51 Fix: tools: Improve crm_mon output with certain option combinations
Author
kgaillot
Browse Repository
No Audits
a5c5caa3ce8a Fix: tools: make crm_mon last updated header consistent across formats
Author
kgaillot
Browse Repository
No Audits
fe7503a7e245 Merge pull request #665 from gao-yan/reset-stonith-failcount
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6c3b705d5edc Merge pull request #662 from davidvossel/dbus-crash-fix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a7a09a27e8a4 Feature: remote: pcmk remote client tool for use with container wrapper script
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e32080b460f8 Merge pull request #666 from kgaillot/lsb
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ff7bf79feec3 Fix: lrmd, services: interpret LSB status codes properly
Author
kgaillot
Browse Repository
No Audits
53d7d54d5a33 Fix: crmd: Reset stonith failcount to recover transitioner when the node rejoins
Author
gao-yan
Browse Repository
No Audits
cb0f29d437de Fix: systemd: fix crash caused when canceling in-flight operation
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (38)

Path

Size

crmd/

extra/

resources/

include/

crm/

pengine/

lib/

lrmd/

pengine/

services/

services_linux.c

lrmd/

pacemaker.spec.in

pengine/

test10/

isolation-restart-all.dot

isolation-restart-all.exp

isolation-restart-all.scores

isolation-restart-all.summary

isolation-restart-all.xml

isolation-start-all.dot

isolation-start-all.exp

isolation-start-all.scores

isolation-start-all.summary

isolation-start-all.xml

tools/

rP3e93bc1dd6c1

crmd/callbacks.c

Loading...

crmd/lrm_state.c

Loading...

extra/resources/Makefile.am

Loading...

extra/resources/docker-wrapper

Loading...

include/crm/msg_xml.h

Loading...

include/crm/pengine/common.h

Loading...

include/crm/pengine/status.h

Loading...

include/crm/services.h

Loading...

include/crm_internal.h

Loading...

lib/lrmd/Makefile.am

Loading...

lib/lrmd/lrmd_client.c

Loading...

lib/lrmd/proxy_common.c

Loading...

lib/pengine/clone.c

Loading...

lib/pengine/complex.c

Loading...

lib/services/dbus.c

Loading...

lib/services/pcmk-dbus.h

Loading...

lib/services/services_linux.c

Loading...

lib/services/systemd.c

Loading...

lib/services/upstart.c

Loading...

lrmd/Makefile.am

Loading...

lrmd/lrmd.c

Loading...

lrmd/lrmd_private.h

Loading...

lrmd/remote_ctl.c

Loading...

pacemaker.spec.in

Loading...

pengine/allocate.c

Loading...

pengine/native.c

Loading...

pengine/regression.sh

Loading...

pengine/test10/isolation-restart-all.dot

Loading...

pengine/test10/isolation-restart-all.exp

Loading...

pengine/test10/isolation-restart-all.scores

Loading...

pengine/test10/isolation-restart-all.summary

Loading...

pengine/test10/isolation-restart-all.xml

Loading...

pengine/test10/isolation-start-all.dot

Loading...

pengine/test10/isolation-start-all.exp

Loading...

pengine/test10/isolation-start-all.scores

Loading...

pengine/test10/isolation-start-all.summary

Loading...

pengine/test10/isolation-start-all.xml

Loading...

tools/crm_mon.c

Loading...