Diffusion Pacemaker 52000372687f

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

Description

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

Details

Provenance

Authored on Jun 10 2015, 8:37 PM

Parents

rP94c0d42a5032: Merge pull request #728 from davidvossel/lrmd-tls-to
rP748647425cd4: Fix: fencing: Correct the all_topology_devices_found() implementation

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

94c0d42a5032 Merge pull request #728 from davidvossel/lrmd-tls-to
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
3534289268ab High: lrmd: set recv timeout upper bound for tls connections
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
37fefb34de5f Merge pull request #724 from jnpkrn/docbook-related
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4b7a48309077 Merge pull request #727 from davidvossel/service_rsc_collision
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e5f23731087c Low: extras: Use dummy resource to help test serialized action execution
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
d5aca4f5dc2b Low: lrmd: regression tests for serializing recurring monitor ops
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f89784f84627 High: services: prevent recurring monitors from colliding with other operations
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9765dd4dddf1 Merge pull request #726 from davidvossel/rsc_node_name
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
d119e21a2b37 Fix: crmd: handle resources named the same as cluster nodes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
ae1e19fe7c84 Med: doc+build: make shared chapters a proper dependency
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
07aff87cf708 Low: doc+build: remove bogus Makefile target
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
044fae29f0a9 Low: doc: unify Preface.xml between CFS and PE
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
af9e203730a1 Med: doc: fix unability to build CFS on Fedora 22
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
6ea4e26e7796 Build: prefer more effective Docbook template discovery
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits

Changes (11)

Path

Size

configure.ac

crmd/

remote_lrmd_ra.c

doc/

	Clusters_from_Scratch/	en-US/
	Pacemaker_Explained/	en-US/

Preface.xml

Makefile.am

Pacemaker_Explained/

en-US/

Preface.xml

extra/

resources/

Dummy

lib/

lrmd/

services/

lrmd/

rP52000372687f

View Options

configure.ac

View Options

crmd/remote_lrmd_ra.c

View Options

doc/Clusters_from_Scratch/en-US/Preface.xml

View Options

doc/Makefile.am

View Options

doc/Pacemaker_Explained/en-US/Preface.xml

View Options

extra/resources/Dummy

View Options

lib/lrmd/lrmd_client.c

View Options

lib/services/services.c

View Options

lib/services/services_linux.c

View Options

lib/services/services_private.h

View Options

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

Description

Details

Event Timeline

Merged Changes

Changes (11)

rP52000372687f

configure.ac

crmd/remote_lrmd_ra.c

doc/Clusters_from_Scratch/en-US/Preface.xml

doc/Makefile.am

doc/Pacemaker_Explained/en-US/Preface.xml

extra/resources/Dummy

lib/lrmd/lrmd_client.c

lib/services/services.c

lib/services/services_linux.c

lib/services/services_private.h

lrmd/regression.py.in

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