Diffusion Pacemaker 46e73e550cb3

Merge remote-tracking branch 'upstream/master' into start-standby
46e73e550cb3
Actions

Description

Merge remote-tracking branch 'upstream/master' into start-standby

Conflicts:
crmd/utils.c

Details

Provenance

Zhuravleva Aleksandra <zhuravleva357@gmail.com>

Authored on Feb 7 2017, 5:40 PM

Parents

rP83a81f750e13: Fix: use callback instead of sync call
rP7b6e29266367: Merge pull request #1221 from jnpkrn/build

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

7b6e29266367 Merge pull request #1221 from jnpkrn/build
Author
kgaillot
Browse Repository
No Audits
b35399b8dd7d Build: spec: accommodate git's new autoscaling hash abbreviation
Author
Jan Pokorny <jpokorny@redhat.com>
Browse Repository
No Audits
0132a1485639 Build: GNUMakefile: normalize quoting a bit, simplify repeated seds
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
a39ea6491a6e Merge pull request #1219 from kgaillot/fail
Author
kgaillot
Browse Repository
No Audits
30052abc2311 Low: attrd: ignore unsupported requests in legacy attrd
Author
kgaillot
Browse Repository
No Audits
e5e5065624b6 Refactor: attrd: functionize updating a single attribute in legacy attrd
Author
kgaillot
Browse Repository
No Audits
f6870b1f6e89 Low: attrd,crmd: implement peer remove requests in legacy attrd
Author
kgaillot
Browse Repository
No Audits
1e801beccedf Refactor: attrd: functionize shared heartbeat/corosync request code
Author
kgaillot
Browse Repository
No Audits
89dbc7daa075 Low: crmd: don't clear remote node transient attributes unnecessarily
Author
kgaillot
Browse Repository
No Audits
05592ec90922 Test: lrmd: use pacemaker (not heartbeat) Dummy in versioned params test
Author
kgaillot
Browse Repository
No Audits
540905202bef Test: CTS: don't continue with remote tests if setup fails
Author
kgaillot
Browse Repository
No Audits
84b90b0b0f4d Merge pull request #1218 from jnpkrn/spec
Author
kgaillot
Browse Repository
No Audits
18cd8eb1735e Build: spec: %define back to %global to prevent recursive declaration
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
121178e9491e Merge pull request #1217 from jnpkrn/asctime
Author
kgaillot
Browse Repository
No Audits
a7476dd96e79 Fix: crm_mon: protect against non-standard or failing asctime
Author
Jan Pokorny <jpokorny@redhat.com>
Browse Repository
No Audits
b8118218c0dc Merge pull request #1216 from jnpkrn/libservices
Author
kgaillot
Browse Repository
No Audits
9acc32260562 Low: libservices(sync): partially prevent killing foreign process
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
142169da5951 Low: libservices (sync): ensure no zombie is left behind
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
40ba78a85c5a Merge pull request #1215 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
3a94d53c8dee Low: cib: improve re-sync handling
Author
kgaillot
Browse Repository
No Audits
64c77a733a52 Refactor: cib: remove dead code
Author
kgaillot
Browse Repository
No Audits
8e7515c918d7 Merge pull request #1213 from ioguix/doc-notify-inactive
Author
kgaillot
Browse Repository
No Audits
976a66ded18f doc: Pacemaker Explained: fix paragraph order and spelling error
Author
Jehan-Guillaume de Rorthais <jgdr@dalibo.com>
Browse Repository
No Audits
bd322ee7872c Doc: Pacemaker Explained: remove *notify_inactive_uname variable
Author
Jehan-Guillaume de Rorthais <jgdr@dalibo.com>
Browse Repository
No Audits
5415551e2440 Merge pull request #1212 from kgaillot/fail
Author
kgaillot
Browse Repository
No Audits
95db10602e8f Fix: tools: implement crm_failcount command-line options correctly
Author
kgaillot
Browse Repository
No Audits
d64a5be5eba2 Refactor: tools: use new functions for failure attribute names
Author
kgaillot
Browse Repository
No Audits
a2f5d569ec84 Refactor: libpe_status: put failcount-related functions in own file
Author
kgaillot
Browse Repository
No Audits
08a244d02bf3 Refactor: crmd: separate attrd-related functions into own source file
Author
kgaillot
Browse Repository
No Audits
63850136d459 Low: libcrmcommon: add functions for generating failure attribute names
Author
kgaillot
Browse Repository
No Audits
60b3ee4f6d0b Low: tools: use correct regular expression for fail counts in crm_resource
Author
kgaillot
Browse Repository
No Audits
f4a74a3a97b8 Doc: Pacemaker Explained: clarify require-all behavior
Author
kgaillot
Browse Repository
No Audits
de5c6c73ad20 Low: cib: never disable legacy mode with corosync 1 stacks
Author
kgaillot
Browse Repository
No Audits
df497ff980a9 Log: cib: improve warning when legacy diff fails
Author
kgaillot
Browse Repository
No Audits
eacd1a651d5c Test: tools: make regression test clean up after itself on success
Author
kgaillot
Browse Repository
No Audits
0c2eab4dd768 Test: tools: ignore source code line numbers when comparing validation output
Author
kgaillot
Browse Repository
No Audits
bf5abe5a3ecc Low: libcrmcommon: ensure filename is not NULL before opening
Author
kgaillot
Browse Repository
No Audits
abef9e8bdc04 Low: crmd: be more resilient when checking an LRM command's "from"
Author
kgaillot
Browse Repository
No Audits
6945262003d4 Merge pull request #1211 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
88472dcb3297 Doc: Pacemaker Remote: document remote-connect-timeout introduced in 1.1.10
Author
kgaillot
Browse Repository
No Audits
06efda973f70 Log: crmd: improve crmd's LRM-related log messages
Author
kgaillot
Browse Repository
No Audits
48904806539a Refactor: tools: functionize generating patch in crm_diff
Author
kgaillot
Browse Repository
No Audits
42f98419698e Refactor: tools: functionize applying patch in crm_diff
Author
kgaillot
Browse Repository
No Audits
348bb53ff57a Refactor: tools: separate patch application and generation code in crm_diff
Author
kgaillot
Browse Repository
No Audits
7939e7290536 Refactor: tools: functionize printing patch in crm_diff
Author
kgaillot
Browse Repository
No Audits
c4dccc7256ea Doc: tools: improve crm_diff description/messages
Author
kgaillot
Browse Repository
No Audits
3ce40b1c6897 Build: make crm_diff source name more obvious
Author
kgaillot
Browse Repository
No Audits
7f76fac04968 Refactor: crmd,tools: use new XML convenience function where appropriate
Author
kgaillot
Browse Repository
No Audits
20a74b9d377c Fix: tools: properly ignore version with crm_diff --no-version
Author
kgaillot
Browse Repository
No Audits
302b5ff8e1f1 Low: libcrmcommon: add convenience function for copying XML element
Author
kgaillot
Browse Repository
No Audits

Changes (238)

Path

Size

attrd/

cib/

crmd/

cts/

doc/

Clusters_from_Scratch/

en-US/

pot/

Ch-Active-Passive.pot

Ch-Apache.pot

Ch-Installation.pot

Ch-Intro.pot

Ch-Shared-Storage.pot

Pacemaker_Development/

en-US/

	Pacemaker_Development/	pot/
	Pacemaker_Remote/	pot/

Author_Group.pot

	Revision_History.pot
	Author_Group.pot

Pacemaker_Explained/

en-US/

Ap-Changes.txt

Ap-Upgrade-Config.txt

Ap-Upgrade.txt

Book_Info.xml

Ch-Advanced-Options.txt

Ch-Advanced-Resources.txt

Pacemaker_Explained.xml

pot/

Ch-Advanced-Options.pot

Ch-Advanced-Resources.pot

Ch-Multi-site-Clusters.pot

Ch-Nodes.pot

Ch-Notifications.pot

Ch-Options.pot

Ch-Resource-Templates.pot

Pacemaker_Explained.pot

Preface.pot

Revision_History.pot

Pacemaker_Remote/

en-US/

pot/

Ch-Baremetal-Tutorial.pot

extra/

alerts/

resources/

rgmanager/

fencing/

include/

crm/

common/

pengine/

lib/

ais/

cib/

cluster/

common/

fencing/

lrmd/

pengine/

services/

transition/

lrmd/

pacemaker_remote.service.in

regression.py.in

mcp/

pacemaker.c

pacemaker.combined.upstart.in

pengine/

regression.core.sh.in

test10/

bug-rh-1097457.summary

guest-node-host-dies.dot

guest-node-host-dies.exp

guest-node-host-dies.scores

guest-node-host-dies.summary

guest-node-host-dies.xml

whitebox-fail1.dot

whitebox-fail1.exp

whitebox-fail1.summary

whitebox-fail2.dot

whitebox-fail2.exp

whitebox-fail2.summary

whitebox-imply-stop-on-fence.dot

whitebox-imply-stop-on-fence.exp

whitebox-imply-stop-on-fence.summary

whitebox-ms-ordering.dot

whitebox-ms-ordering.exp

whitebox-ms-ordering.summary

whitebox-unexpectedly-running.dot

whitebox-unexpectedly-running.exp

whitebox-unexpectedly-running.summary

rpmlintrc

tools/

Makefile.am

attrd_updater.c

	crm_diff.c
	xml_diff.c

crm_resource_runtime.c

regression.validity.exp

xml/

rP46e73e550cb3

View Options

.gitattributes

View Options

.gitignore

View Options

.tito.spec.tmpl

View Options

.tito/custom.py

View Options

.tito/tito.props

View Options

BasicSanity.sh

View Options

COPYING

View Options

ChangeLog

View Options

GNUmakefile

View Options

INSTALL.md

View Options

Makefile.am

View Options

acinclude.m4

View Options

attrd/commands.c

View Options

attrd/legacy.c

View Options

autogen.sh

View Options

cib/main.c

View Options

cib/messages.c

View Options

configure.ac

View Options

crmd/Makefile.am

View Options

crmd/attrd.c

View Options

crmd/crmd_lrm.h

View Options

crmd/join_dc.c

View Options

crmd/lrm.c

View Options

crmd/messages.c

View Options

crmd/remote_lrmd_ra.c

View Options

crmd/te_actions.c

View Options

crmd/te_callbacks.c

View Options

crmd/te_events.c

View Options

crmd/te_utils.c

View Options

crmd/throttle.c

View Options

crmd/utils.c

View Options

cts/CTS.py

View Options

cts/CTSaudits.py

View Options

cts/CTSscenarios.py

View Options

cts/CTStests.py

View Options

cts/patterns.py

View Options

doc/Clusters_from_Scratch/en-US/Ch-Apache.txt

View Options

doc/Clusters_from_Scratch/pot/Ap-Configuration.pot

View Options

doc/Clusters_from_Scratch/pot/Ap-Corosync-Conf.pot

View Options

doc/Clusters_from_Scratch/pot/Ap-Reading.pot

View Options

doc/Clusters_from_Scratch/pot/Author_Group.pot

View Options

doc/Clusters_from_Scratch/pot/Book_Info.pot

View Options

doc/Clusters_from_Scratch/pot/Ch-Active-Active.pot

View Options

doc/Clusters_from_Scratch/pot/Ch-Active-Passive.pot

View Options

doc/Clusters_from_Scratch/pot/Ch-Apache.pot

View Options

doc/Clusters_from_Scratch/pot/Ch-Installation.pot

View Options

doc/Clusters_from_Scratch/pot/Ch-Intro.pot

View Options

doc/Clusters_from_Scratch/pot/Ch-Shared-Storage.pot

View Options

doc/Clusters_from_Scratch/pot/Ch-Stonith.pot

View Options

doc/Clusters_from_Scratch/pot/Ch-Tools.pot

View Options

doc/Clusters_from_Scratch/pot/Ch-Verification.pot

View Options

doc/Clusters_from_Scratch/pot/Preface.pot

View Options

doc/Clusters_from_Scratch/pot/Revision_History.pot

View Options

doc/Makefile.am

View Options

doc/Pacemaker_Development/en-US/Ch-FAQ.txt

View Options

doc/Pacemaker_Development/pot/Author_Group.pot

View Options

doc/Pacemaker_Development/pot/Book_Info.pot

View Options

doc/Pacemaker_Development/pot/Ch-Coding.pot

View Options

doc/Pacemaker_Development/pot/Ch-FAQ.pot

View Options

doc/Pacemaker_Development/pot/Ch-Python.pot

View Options

doc/Pacemaker_Development/pot/Revision_History.pot

View Options

doc/Pacemaker_Explained/en-US/Ap-Changes.txt

View Options

doc/Pacemaker_Explained/en-US/Ap-Upgrade-Config.txt

View Options

doc/Pacemaker_Explained/en-US/Ap-Upgrade.txt

View Options

doc/Pacemaker_Explained/en-US/Book_Info.xml

View Options

doc/Pacemaker_Explained/en-US/Ch-Advanced-Options.txt

View Options

doc/Pacemaker_Explained/en-US/Ch-Advanced-Resources.txt

View Options

doc/Pacemaker_Explained/en-US/Ch-Constraints.txt

View Options

doc/Pacemaker_Explained/en-US/Ch-Options.txt

View Options

doc/Pacemaker_Explained/en-US/Ch-Resources.txt

View Options

doc/Pacemaker_Explained/en-US/Ch-Rules.txt

View Options

doc/Pacemaker_Explained/en-US/Ch-Stonith.txt

View Options

doc/Pacemaker_Explained/en-US/Pacemaker_Explained.xml

View Options

doc/Pacemaker_Explained/en-US/Revision_History.xml

View Options

doc/Pacemaker_Explained/pot/Ap-Debug.pot

View Options

doc/Pacemaker_Explained/pot/Ap-FAQ.pot

View Options

doc/Pacemaker_Explained/pot/Ap-Install.pot

View Options

doc/Pacemaker_Explained/pot/Ap-LSB.pot

View Options

doc/Pacemaker_Explained/pot/Ap-OCF.pot

View Options

doc/Pacemaker_Explained/pot/Ap-Samples.pot

View Options

doc/Pacemaker_Explained/pot/Ap-Upgrade.pot

View Options

doc/Pacemaker_Explained/pot/Author_Group.pot

View Options

doc/Pacemaker_Explained/pot/Book_Info.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Advanced-Options.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Advanced-Resources.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Alerts.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Basics.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Constraints.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Intro.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Multi-site-Clusters.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Nodes.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Notifications.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Options.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Resource-Templates.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Resources.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Rules.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Status.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Stonith.pot

View Options

doc/Pacemaker_Explained/pot/Ch-Utilization.pot

View Options

doc/Pacemaker_Explained/pot/Pacemaker_Explained.pot

View Options

doc/Pacemaker_Explained/pot/Preface.pot

View Options

doc/Pacemaker_Explained/pot/Revision_History.pot

View Options

doc/Pacemaker_Remote/en-US/Book_Info.xml

View Options

doc/Pacemaker_Remote/en-US/Ch-Intro.txt

View Options

doc/Pacemaker_Remote/en-US/Ch-Options.txt

View Options

doc/Pacemaker_Remote/en-US/Revision_History.xml

View Options

doc/Pacemaker_Remote/pot/Author_Group.pot

View Options

doc/Pacemaker_Remote/pot/Book_Info.pot

View Options

doc/Pacemaker_Remote/pot/Ch-Alternatives.pot

View Options

doc/Pacemaker_Remote/pot/Ch-Baremetal-Tutorial.pot

View Options

doc/Pacemaker_Remote/pot/Ch-Example.pot

View Options

doc/Pacemaker_Remote/pot/Ch-Intro.pot

View Options

doc/Pacemaker_Remote/pot/Ch-KVM-Tutorial.pot

View Options

doc/Pacemaker_Remote/pot/Ch-Options.pot

View Options

doc/Pacemaker_Remote/pot/Revision_History.pot

View Options

doc/index.php

View Options

doc/security.txt

View Options

extra/alerts/alert_snmp.sh.sample

View Options

extra/clustermon.sh

View Options

extra/resources/ClusterMon

View Options

extra/resources/Makefile.am

View Options

extra/resources/SysInfo

View Options

extra/resources/attribute

View Options

extra/rgmanager/README

View Options

fencing/admin.c

View Options

fencing/commands.c

View Options

include/crm/common/internal.h

View Options

include/crm/common/xml.h

View Options

include/crm/crm.h

View Options

include/crm/lrmd.h

View Options

include/crm/msg_xml.h

View Options

include/crm/pengine/internal.h

View Options

include/crm/pengine/status.h

View Options

include/crm/services.h

View Options

lib/ais/plugin.c

View Options

lib/ais/plugin.h

View Options

lib/cib/Makefile.am

View Options

lib/cluster/Makefile.am

View Options

lib/cluster/cpg.c

View Options

lib/cluster/election.c

View Options

lib/cluster/heartbeat.c

View Options

lib/common/Makefile.am

View Options

lib/common/cib_secrets.c

View Options

lib/common/ipc.c

View Options

lib/common/mainloop.c

View Options

lib/common/remote.c

View Options

lib/common/schemas.c

View Options

lib/common/strings.c

View Options

lib/common/watchdog.c

View Options

lib/common/xml.c

View Options

lib/fencing/Makefile.am

View Options

lib/lrmd/Makefile.am

View Options

lib/pengine/Makefile.am

View Options

lib/pengine/clone.c

View Options

lib/pengine/failcounts.c

View Options

lib/pengine/unpack.c

View Options

lib/pengine/utils.c

View Options

lib/services/Makefile.am

View Options

lib/services/dbus.c

View Options

lib/services/pcmk-dbus.h

View Options

lib/services/services.c

View Options

lib/services/services_linux.c

View Options

lib/services/systemd.c

View Options

lib/services/upstart.c

View Options

lib/transition/Makefile.am

View Options

lrmd/Makefile.am

View Options

lrmd/lrmd.c

View Options

lrmd/pacemaker_remote.service.in

View Options

lrmd/regression.py.in

View Options

mcp/pacemaker.c

View Options

mcp/pacemaker.combined.upstart.in

View Options

mcp/pacemaker.service.in

View Options

mcp/pacemaker.sysconfig

View Options

pacemaker.spec.in

View Options

pengine/Makefile.am

View Options

pengine/allocate.c

View Options

pengine/constraints.c

View Options

pengine/graph.c

View Options

pengine/main.c

View Options

pengine/native.c

View Options

pengine/regression.core.sh.in

View Options

pengine/regression.sh

View Options

pengine/test10/bug-cl-5247.dot

View Options

pengine/test10/bug-cl-5247.exp

View Options

pengine/test10/bug-cl-5247.summary

View Options

pengine/test10/bug-rh-1097457.dot

View Options

pengine/test10/bug-rh-1097457.exp

View Options

pengine/test10/bug-rh-1097457.summary

View Options

pengine/test10/guest-node-host-dies.dot

View Options

pengine/test10/guest-node-host-dies.exp

View Options

pengine/test10/guest-node-host-dies.scores

View Options

pengine/test10/guest-node-host-dies.summary

View Options

pengine/test10/guest-node-host-dies.xml

View Options

pengine/test10/whitebox-fail1.dot

View Options

pengine/test10/whitebox-fail1.exp

View Options

pengine/test10/whitebox-fail1.summary

View Options

pengine/test10/whitebox-fail2.dot

View Options

pengine/test10/whitebox-fail2.exp

View Options

pengine/test10/whitebox-fail2.summary

View Options

pengine/test10/whitebox-imply-stop-on-fence.dot

View Options

pengine/test10/whitebox-imply-stop-on-fence.exp

View Options

pengine/test10/whitebox-imply-stop-on-fence.summary

View Options

pengine/test10/whitebox-ms-ordering.dot

View Options

pengine/test10/whitebox-ms-ordering.exp

View Options

pengine/test10/whitebox-ms-ordering.summary

View Options

pengine/test10/whitebox-unexpectedly-running.dot

View Options

pengine/test10/whitebox-unexpectedly-running.exp

View Options

pengine/test10/whitebox-unexpectedly-running.summary

View Options

rpmlintrc

View Options

tools/Makefile.am

View Options

tools/attrd_updater.c

View Options

tools/crm_diff.c

View Options

tools/crm_failcount

View Options

tools/crm_mon.c

View Options

tools/crm_node.c

View Options

tools/crm_report.in

View Options

tools/crm_resource.c

View Options

tools/crm_resource_ban.c

View Options

tools/crm_resource_runtime.c

View Options

tools/crm_standby

View Options

tools/fake_transition.c

View Options

tools/regression.sh

View Options

tools/regression.tools.exp

View Options

tools/regression.validity.exp

View Options

tools/report.collector

View Options

tools/report.common.in

View Options

tools/xml_diff.c

View Options

version.m4

View Options

xml/Readme.md

View Options

xml/constraints-1.0.rng

View Options

xml/constraints-1.2.rng

View Options

xml/constraints-2.1.rng

View Options

xml/constraints-2.2.rng

View Options

xml/constraints-2.3.rng

View Options

xml/constraints-2.6.rng

View Options

Merge remote-tracking branch 'upstream/master' into start-standby46e73e550cb3Actions

Description

Details

Event Timeline

Merged Changes

Changes (238)

rP46e73e550cb3

.gitattributes

.gitignore

.tito.spec.tmpl

.tito/custom.py

.tito/tito.props

BasicSanity.sh

COPYING

ChangeLog

GNUmakefile

INSTALL.md

Makefile.am

acinclude.m4

attrd/commands.c

attrd/legacy.c

autogen.sh

cib/main.c

cib/messages.c

configure.ac

crmd/Makefile.am

crmd/attrd.c

crmd/crmd_lrm.h

crmd/join_dc.c

crmd/lrm.c

crmd/messages.c

crmd/remote_lrmd_ra.c

crmd/te_actions.c

crmd/te_callbacks.c

crmd/te_events.c

crmd/te_utils.c

crmd/throttle.c

crmd/utils.c

cts/CTS.py

cts/CTSaudits.py

cts/CTSscenarios.py

cts/CTStests.py

cts/patterns.py

doc/Clusters_from_Scratch/en-US/Ch-Apache.txt

doc/Clusters_from_Scratch/pot/Ap-Configuration.pot

doc/Clusters_from_Scratch/pot/Ap-Corosync-Conf.pot

doc/Clusters_from_Scratch/pot/Ap-Reading.pot

doc/Clusters_from_Scratch/pot/Author_Group.pot

doc/Clusters_from_Scratch/pot/Book_Info.pot

doc/Clusters_from_Scratch/pot/Ch-Active-Active.pot

doc/Clusters_from_Scratch/pot/Ch-Active-Passive.pot

doc/Clusters_from_Scratch/pot/Ch-Apache.pot

doc/Clusters_from_Scratch/pot/Ch-Installation.pot

doc/Clusters_from_Scratch/pot/Ch-Intro.pot

doc/Clusters_from_Scratch/pot/Ch-Shared-Storage.pot

doc/Clusters_from_Scratch/pot/Ch-Stonith.pot

doc/Clusters_from_Scratch/pot/Ch-Tools.pot

doc/Clusters_from_Scratch/pot/Ch-Verification.pot

doc/Clusters_from_Scratch/pot/Preface.pot

doc/Clusters_from_Scratch/pot/Revision_History.pot

doc/Makefile.am

doc/Pacemaker_Development/en-US/Ch-FAQ.txt

doc/Pacemaker_Development/pot/Author_Group.pot

doc/Pacemaker_Development/pot/Book_Info.pot

doc/Pacemaker_Development/pot/Ch-Coding.pot

doc/Pacemaker_Development/pot/Ch-FAQ.pot

doc/Pacemaker_Development/pot/Ch-Python.pot

doc/Pacemaker_Development/pot/Revision_History.pot

doc/Pacemaker_Explained/en-US/Ap-Changes.txt

doc/Pacemaker_Explained/en-US/Ap-Upgrade-Config.txt

doc/Pacemaker_Explained/en-US/Ap-Upgrade.txt

doc/Pacemaker_Explained/en-US/Book_Info.xml

doc/Pacemaker_Explained/en-US/Ch-Advanced-Options.txt

doc/Pacemaker_Explained/en-US/Ch-Advanced-Resources.txt

doc/Pacemaker_Explained/en-US/Ch-Constraints.txt

doc/Pacemaker_Explained/en-US/Ch-Options.txt

doc/Pacemaker_Explained/en-US/Ch-Resources.txt

doc/Pacemaker_Explained/en-US/Ch-Rules.txt

doc/Pacemaker_Explained/en-US/Ch-Stonith.txt

doc/Pacemaker_Explained/en-US/Pacemaker_Explained.xml

Merge remote-tracking branch 'upstream/master' into start-standby
46e73e550cb3
Actions