HomeClusterLabs Projects
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.

Changes (238)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.
PathSize
attrd/
cib/
crmd/
cts/
doc/
Clusters_from_Scratch/
en-US/
pot/
Pacemaker_Development/
en-US/
Pacemaker_Development/
pot/
Pacemaker_Remote/
pot/
Revision_History.pot
Author_Group.pot
Pacemaker_Explained/
en-US/
pot/
Pacemaker_Remote/
en-US/
pot/
extra/
alerts/
resources/
rgmanager/
fencing/
include/
crm/
common/
pengine/
lib/
ais/
cib/
cluster/
common/
fencing/
lrmd/
pengine/
services/
transition/
lrmd/
mcp/
pengine/
test10/
tools/
crm_diff.c
xml_diff.c
xml/

rP46e73e550cb3

View Options

.gitattributes

View Options

.tito.spec.tmpl

View Options

.tito/custom.py

View Options

.tito/tito.props

View Options

BasicSanity.sh

View Options

attrd/commands.c

View Options

attrd/legacy.c

View Options

cib/messages.c

View Options

crmd/Makefile.am

View Options

crmd/crmd_lrm.h

View Options

crmd/join_dc.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

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/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/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

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

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

xml/resources-2.7.rng