Diffusion Pacemaker ee298e8abc8e

Merge branch 'master' of github.com:ClusterLabs/pacemaker
ee298e8abc8e
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 Sep 26 2013, 2:11 AM

Parents

rPc68919f46bba: Merge pull request #359 from l-mb/master
rPdc295190e22a: Fix: crm_report: Correctly redirect quorumtool error messages

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

c68919f46bba Merge pull request #359 from l-mb/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a56cee155a63 High: plugin: stonith-ng needs membership updates
Author
Lars Marowsky-Bree <lmb@suse.com>
Browse Repository
No Audits
deaf8176b8bb Low: controld: allow the stonith-enabled check to be overridden
Author
Lars Marowsky-Bree <lmb@suse.com>
Browse Repository
No Audits
f1bb2a8bd2fd Merge pull request #358 from davidvossel/container-probes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
29959fb2f082 High: attrd: Avoid infinite write loop for unknown peers
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
3c5a6c7f47b6 Low: attrd: fixes log message typo
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9d8e95518d36 low: tools: Detect orphaned remote-nodes when setting attributes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
85c1065fa4bb Low: cts: Hide stderr from probes in lxc container test
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5a99b1d7b489 Merge pull request #357 from ldzhong/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d42c8a811a33 don't start dlm if stonith-enabled is false
Author
ldzhong <ultra.gammaray@gmail.com>
Browse Repository
No Audits
e39e966b6eb8 Low: pengine: Regression tests updated for container node probes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
15a86e501a57 High: pengine: Probe container nodes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
2a8c5de12f84 Merge pull request #356 from l-mb/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
24b6ddc25130 Merge pull request #355 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
62c74d4ace8d Low: spelling fixes in comments and log messages
Author
Lars Marowsky-Bree <lmb@suse.com>
Browse Repository
No Audits
c6f79b680751 High: crmd: Tell attrd when remote-node is disconnected
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
488d82feddde High: attrd: Give remote-nodes ability to set attributes with attrd
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
144c2fc4b2f5 Merge pull request #354 from davidvossel/pcmk_remote_cts
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
0e72ac1f5c70 Low: cts: Add RemoteBaremetal to standard test set
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
37cb93c73f13 Low: cts: Autogenerate pcmk remote key for cts tests
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
8ee1c9506ebe Merge pull request #353 from gao-yan/expected-quorum-votes
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c0e3076afed5 Fix: crmd: Expose "expected-quorum-votes" option in the metadata only for…
Author
gao-yan
Browse Repository
No Audits

Changes (68)

Path

Size

attrd/

crmd/

remote_lrmd_ra.c

cts/

lxc_autogen.sh.in

doc/

extra/

resources/

fencing/

include/

crm/

compatibility.h

pengine/

lib/

ais/

cib/

cluster/

common/

fencing/

pengine/

mcp/

pacemaker.sysconfig

pengine/

test10/

whitebox-asymmetric.dot

whitebox-asymmetric.exp

whitebox-asymmetric.summary

whitebox-fail1.dot

whitebox-fail1.exp

whitebox-fail1.summary

whitebox-fail2.dot

whitebox-fail2.exp

whitebox-fail2.summary

whitebox-fail3.dot

whitebox-fail3.exp

whitebox-fail3.summary

whitebox-move.dot

whitebox-move.exp

whitebox-move.summary

whitebox-ms-ordering.dot

whitebox-ms-ordering.exp

whitebox-orphan-ms.pe.dot

whitebox-orphaned.dot

whitebox-orphaned.exp

whitebox-orphaned.summary

whitebox-start.dot

whitebox-start.exp

whitebox-start.summary

whitebox-stop.dot

whitebox-stop.exp

whitebox-stop.summary

tools/

attrd_updater.c

crm_attribute.c

xml/

crm-transitional.dtd

rPee298e8abc8e

attrd/commands.c

Loading...

attrd/internal.h

Loading...

attrd/main.c

Loading...

crmd/control.c

Loading...

crmd/corosync.c

Loading...

crmd/crmd_utils.h

Loading...

crmd/fsa_defines.h

Loading...

crmd/remote_lrmd_ra.c

Loading...

crmd/utils.c

Loading...

cts/CM_ais.py

Loading...

cts/CTSlab.py

Loading...

cts/CTStests.py

Loading...

cts/lxc_autogen.sh.in

Loading...

doc/msg-schema.txt

Loading...

extra/resources/controld

Loading...

fencing/commands.c

Loading...

include/crm/attrd.h

Loading...

include/crm/cluster.h

Loading...

include/crm/compatibility.h

Loading...

include/crm/pengine/internal.h

Loading...

include/crm_internal.h

Loading...

lib/ais/plugin.c

Loading...

lib/cib/cib_attrs.c

Loading...

lib/cib/cib_native.c

Loading...

lib/cluster/corosync.c

Loading...

lib/cluster/legacy.c

Loading...

lib/cluster/membership.c

Loading...

lib/common/ipc.c

Loading...

lib/common/utils.c

Loading...

lib/fencing/st_client.c

Loading...

lib/pengine/utils.c

Loading...

mcp/pacemaker.c

Loading...

mcp/pacemaker.sysconfig

Loading...

pengine/allocate.c

Loading...

pengine/master.c

Loading...

pengine/native.c

Loading...

pengine/test10/whitebox-asymmetric.dot

Loading...

pengine/test10/whitebox-asymmetric.exp

Loading...

pengine/test10/whitebox-asymmetric.summary

Loading...

pengine/test10/whitebox-fail1.dot

Loading...

pengine/test10/whitebox-fail1.exp

Loading...

pengine/test10/whitebox-fail1.summary

Loading...

pengine/test10/whitebox-fail2.dot

Loading...

pengine/test10/whitebox-fail2.exp

Loading...

pengine/test10/whitebox-fail2.summary

Loading...

pengine/test10/whitebox-fail3.dot

Loading...

pengine/test10/whitebox-fail3.exp

Loading...

pengine/test10/whitebox-fail3.summary

Loading...

pengine/test10/whitebox-move.dot

Loading...

pengine/test10/whitebox-move.exp

Loading...

pengine/test10/whitebox-move.summary

Loading...

pengine/test10/whitebox-ms-ordering.dot

Loading...

pengine/test10/whitebox-ms-ordering.exp

Loading...

pengine/test10/whitebox-orphan-ms.pe.dot

Loading...

pengine/test10/whitebox-orphaned.dot

Loading...

pengine/test10/whitebox-orphaned.exp

Loading...

pengine/test10/whitebox-orphaned.summary

Loading...

pengine/test10/whitebox-start.dot

Loading...

pengine/test10/whitebox-start.exp

Loading...

pengine/test10/whitebox-start.summary

Loading...

pengine/test10/whitebox-stop.dot

Loading...

pengine/test10/whitebox-stop.exp

Loading...

pengine/test10/whitebox-stop.summary

Loading...

tools/attrd_updater.c

Loading...

tools/crm_attribute.c

Loading...

tools/crm_resource.c

Loading...

xml/crm-1.0.dtd

Loading...

xml/crm-transitional.dtd

Loading...