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

Description

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

Details

Provenance

Authored on Oct 21 2014, 9:12 PM

Parents

rPff52d8471808: Merge pull request #600 from davidvossel/master
rP529e54e1b565: Fix: Fencing: If configured, wait stonith-watchdog-timer seconds for self…

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

ff52d8471808 Merge pull request #600 from davidvossel/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1b855f9a6275 Low: build: Add ability to set custom spec version for 'make rpm'
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
347ee3b86435 Merge pull request #599 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
31867a4d4d16 Low: cts: ignore patterns for RemoteRscFailure test
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f06b21bd52a4 Low: cts: RemoteRscFailure test verifies monitoring of rscs on remote-nodes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
1c32dd808300 Low: crm_resource: Allow -M location to be reinforced with -f even if rsc is…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
233c13d40ac2 Low: cts: Remote connection migration test
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
28aee948cebd Merge pull request #597 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
c0f231e5fdd7 Low: cts: baremetal remote stonithd ignore patterns
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
61051d17f09a Low: cts: baremetal remote fencing test
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5aed0061c8da Merge pull request #598 from HideoYamauchi/changeLoglevel
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6cb1cbab7a85 Change of the log level.
Author
HideoYamauchi
Browse Repository
No Audits
2cbfd4a6729c Low: remote: advertise default port correctly, further adjust default timeout…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5f06256788f5 Fix: remote: report timestamps for remote connection resource operations
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
c38ef7c64eeb Low: cts: refactor fence watch patterns for pattern reuse
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
aeb21eda6224 Low: cts: Make the remotebaremetal test reusable as the base for other tests
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
2f0f94b5a596 Merge pull request #596 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
50ceea53bc1f Low: cts: move custom RemoteBaremetal pattern into patterns.py
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a4b07df76c92 Merge pull request #593 from davidvossel/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7cfe712adfd2 Fix: pengine: allow remote-nodes to be placed in maintenance mode
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
6c9bb27f45d7 Merge pull request #592 from gao-yan/xml-patch-no-versions
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b5ad36e84133 Merge pull request #589 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
ada76264fe2c Fix: xml: Prevent assert errors in crm_element_value() on applying a patch…
Author
gao-yan
Browse Repository
No Audits
b125a2e0566d High: pengine: prevent disabling rsc discovery per node in certain situations
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
272814b6423d Merge pull request #584 from HideoYamauchi/change_log
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
cb6755945ac3 Merge pull request #590 from krig/ping-fixes
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
35b8c8ffdfce Merge pull request #591 from lge/for-beekhof
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
02060d234e07 Low: pengine: regression test for pengine per node rsc discovery
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5ecc36c16617 High: crm_resource: avoid deletion of lrm cache on node with resource discovery…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
ecdfa39ac251 High: pengine: per-node control over resource discovery
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
c747f20d1983 mainloop: fix potential segfault for fd = 0
Author
Lars Ellenberg <lars.ellenberg@linbit.com>
Browse Repository
No Audits
27f8047c0afa Low: ping: Correct metadata for attempts parameter
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
77de4f36b257 Low: ping: Pass extra options to fping
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
1819b40055f2 Low: ping: Remove incorrectly advertised migrate_to|migrate_from
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
e3277d0ec52d Low: ping: Add use_fping parameter
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
dc7fe545d98b Fix: ping: Correctly advertise multiplier default
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
6b0a26331f53 Low: pengine: resource-discovery regression test
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
2e2be87a7ef6 High: pengine: resource discovery mode for location constraints
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a36144cd5fd8 Correction of the log output of the practice node of stonith.(2)
Author
HideoYamauchi
Browse Repository
No Audits
b3a41c426f82 Correction of the log output of the practice node of stonith.
Author
HideoYamauchi
Browse Repository
No Audits

Changes (33)

Path

Size

crmd/

cts/

extra/

resources/

ping

remote

fencing/

remote.c

include/

crm/

msg_xml.h

pengine/

status.h

lib/

common/

pengine/

pengine/

test10/

resource-discovery.dot

resource-discovery.exp

resource-discovery.scores

resource-discovery.summary

	resource-discovery.xml
	remote-startup-probes.xml

rsc-discovery-per-node.dot

rsc-discovery-per-node.exp

rsc-discovery-per-node.scores

rsc-discovery-per-node.summary

	rsc-discovery-per-node.xml
	remote-startup-probes.xml

tools/

xml/

rP31cf859dfb7f

View Options

GNUmakefile

View Options

crmd/remote_lrmd_ra.c

View Options

crmd/te_utils.c

View Options

cts/CIB.py

View Options

cts/CTStests.py

View Options

cts/patterns.py

View Options

extra/resources/ping

View Options

extra/resources/remote

View Options

fencing/remote.c

View Options

include/crm/msg_xml.h

View Options

include/crm/pengine/status.h

View Options

lib/common/mainloop.c

View Options

lib/common/xml.c

View Options

lib/pengine/unpack.c

View Options

pengine/allocate.c

View Options

pengine/constraints.c

View Options

pengine/native.c

View Options

pengine/pengine.h

View Options

pengine/regression.sh

View Options

pengine/test10/resource-discovery.dot

View Options

pengine/test10/resource-discovery.exp

View Options

pengine/test10/resource-discovery.scores

View Options

pengine/test10/resource-discovery.summary

View Options

pengine/test10/resource-discovery.xml

View Options

pengine/test10/rsc-discovery-per-node.dot

View Options

pengine/test10/rsc-discovery-per-node.exp

View Options

pengine/test10/rsc-discovery-per-node.scores

View Options

pengine/test10/rsc-discovery-per-node.summary

View Options

pengine/test10/rsc-discovery-per-node.xml

View Options

pengine/utils.c

View Options

pengine/utils.h

View Options

tools/crm_resource.c

View Options

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

Description

Details

Event Timeline

Merged Changes

Changes (33)

rP31cf859dfb7f

GNUmakefile

crmd/remote_lrmd_ra.c

crmd/te_utils.c

cts/CIB.py

cts/CTStests.py

cts/patterns.py

extra/resources/ping

extra/resources/remote

fencing/remote.c

include/crm/msg_xml.h

include/crm/pengine/status.h

lib/common/mainloop.c

lib/common/xml.c

lib/pengine/unpack.c

pengine/allocate.c

pengine/constraints.c

pengine/native.c

pengine/pengine.h

pengine/regression.sh

pengine/test10/resource-discovery.dot

pengine/test10/resource-discovery.exp

pengine/test10/resource-discovery.scores

pengine/test10/resource-discovery.summary

pengine/test10/resource-discovery.xml

pengine/test10/rsc-discovery-per-node.dot

pengine/test10/rsc-discovery-per-node.exp

pengine/test10/rsc-discovery-per-node.scores

pengine/test10/rsc-discovery-per-node.summary

pengine/test10/rsc-discovery-per-node.xml

pengine/utils.c

pengine/utils.h

tools/crm_resource.c

xml/constraints-next.rng

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