HomeClusterLabs Projects
Diffusion Pacemaker 36be0b1ee7da

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

Description

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

Details

Provenance
Andrew Beekhof <andrew@beekhof.net>Authored on Feb 22 2015, 6:01 PM
Parents
rP77ee8b2943a3: Merge pull request #635 from kgaillot/doc
rP771444352ae2: Fix: attrd: refresh should force an immediate write-out of all attributes
Branches
Unknown
Tags
Unknown

Event Timeline

Merged Changes

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

Changes (161)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.
PathSize
cib/
crmd/
cts/
HBDummy.in
LSBDummy.in
doc/
Clusters_from_Scratch/
en-US/
ro-RO/
Pacemaker_Explained/
en-US/
shared/
en-US/
Clusters_from_Scratch/
en-US/
fencing/
include/
crm/
cib/
cluster/
common/
lib/
cib/
cluster/
common/
lrmd/
pengine/
services/
lrmd/
pengine/
test10/
tools/

rP36be0b1ee7da

View Options

cib/callbacks.c

View Options

crmd/control.c

View Options

crmd/election.c

View Options

crmd/heartbeat.c

View Options

crmd/membership.c

View Options

crmd/pengine.c

View Options

crmd/te_actions.c

View Options

crmd/te_utils.c

View Options

cts/HBDummy.in

View Options

cts/LSBDummy.in

View Options

cts/Makefile.am

View Options

doc/Clusters_from_Scratch/en-US/Book_Info.xml

View Options

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

View Options

doc/Clusters_from_Scratch/en-US/Clusters_from_Scratch.ent

View Options

doc/Clusters_from_Scratch/en-US/Revision_History.xml

View Options

doc/Clusters_from_Scratch/ro-RO/Ch-Apache.po

View Options

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

View Options

doc/Pacemaker_Explained/en-US/Ap-FAQ.xml

View Options

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

View Options

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

View Options

doc/Pacemaker_Explained/en-US/Ap-Samples.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/Ch-Advanced-Options.txt

View Options

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

View Options

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

View Options

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

View Options

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

View Options

doc/Pacemaker_Explained/en-US/Ch-Multi-site-Clusters.txt

View Options

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

View Options

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

View Options

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

View Options

doc/Pacemaker_Explained/en-US/Ch-Resource-Templates.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/Ch-Utilization.txt

View Options

doc/Pacemaker_Explained/en-US/Pacemaker_Explained.xml

View Options

doc/coding_guidelines.txt

View Options

doc/shared/en-US/pacemaker-intro.txt

View Options

fencing/main.c

View Options

include/crm/cib/internal.h

View Options

include/crm/cluster/internal.h

View Options

include/crm/common/Makefile.am

View Options

include/crm/common/io.h

View Options

include/crm/error.h

View Options

include/crm_internal.h

View Options

lib/cib/cib_file.c

View Options

lib/cluster/heartbeat.c

View Options

lib/cluster/membership.c

View Options

lib/common/Makefile.am

View Options

lib/common/compat.c

View Options

lib/common/digest.c

View Options

lib/common/io.c

View Options

lib/common/logging.c

View Options

lib/common/utils.c

View Options

lib/common/xml.c

View Options

lib/lrmd/lrmd_client.c

View Options

lib/pengine/native.c

View Options

lib/pengine/unpack.c

View Options

lib/services/services.c

View Options

lib/services/services_private.h

View Options

lrmd/regression.py.in

View Options

pengine/allocate.c

View Options

pengine/constraints.c

View Options

pengine/graph.c

View Options

pengine/regression.sh

View Options

pengine/test10/8-am-then-bm-a-migrating-b-stopping.summary

View Options

pengine/test10/9-am-then-bm-b-migrating-a-stopping.summary

View Options

pengine/test10/a-demote-then-b-migrate.dot

View Options

pengine/test10/a-demote-then-b-migrate.exp

View Options

pengine/test10/a-demote-then-b-migrate.scores

View Options

pengine/test10/a-demote-then-b-migrate.summary

View Options

pengine/test10/a-demote-then-b-migrate.xml

View Options

pengine/test10/a-promote-then-b-migrate.dot

View Options

pengine/test10/a-promote-then-b-migrate.exp

View Options

pengine/test10/a-promote-then-b-migrate.scores

View Options

pengine/test10/a-promote-then-b-migrate.summary

View Options

pengine/test10/a-promote-then-b-migrate.xml

View Options

pengine/test10/bug-1718.summary

View Options

pengine/test10/bug-5014-A-stop-B-started.summary

View Options

pengine/test10/bug-5014-A-stopped-B-stopped.summary

View Options

pengine/test10/bug-5014-CthenAthenB-C-stopped.summary

View Options

pengine/test10/bug-5014-GROUP-A-stopped-B-started.summary

View Options

pengine/test10/bug-5014-GROUP-A-stopped-B-stopped.summary

View Options

pengine/test10/bug-5014-ordered-set-symmetrical-false.summary

View Options

pengine/test10/bug-5014-ordered-set-symmetrical-true.summary

View Options

pengine/test10/bug-5143-ms-shuffle.summary

View Options

pengine/test10/bug-cl-5219.summary

View Options

pengine/test10/bug-lf-2422.summary

View Options

pengine/test10/bug-lf-2606.summary

View Options

pengine/test10/bug-rh-1097457.summary

View Options

pengine/test10/bug-suse-707150.summary

View Options

pengine/test10/coloc-clone-stays-active.summary

View Options

pengine/test10/colocation_constraint_stops_slave.summary

View Options

pengine/test10/complex_enforce_colo.dot

View Options

pengine/test10/complex_enforce_colo.exp

View Options

pengine/test10/complex_enforce_colo.scores

View Options

pengine/test10/complex_enforce_colo.summary

View Options

pengine/test10/complex_enforce_colo.xml

View Options

pengine/test10/enforce-colo1.dot

View Options

pengine/test10/enforce-colo1.exp

View Options

pengine/test10/enforce-colo1.scores

View Options

pengine/test10/enforce-colo1.summary

View Options

pengine/test10/enforce-colo1.xml

View Options

pengine/test10/group11.summary

View Options

pengine/test10/load-stopped-loop.summary

View Options

pengine/test10/master-depend.summary

View Options

pengine/test10/master-probed-score.summary

View Options

pengine/test10/master-promotion-constraint.summary

View Options

pengine/test10/novell-251689.summary

View Options

pengine/test10/one-or-more-1.summary

View Options

pengine/test10/one-or-more-2.summary

View Options

pengine/test10/one-or-more-3.summary

View Options

pengine/test10/one-or-more-4.summary

View Options

pengine/test10/one-or-more-5.summary

View Options

pengine/test10/one-or-more-6.summary

View Options

pengine/test10/one-or-more-7.summary

View Options

pengine/test10/order_constraint_stops_master.summary

View Options

pengine/test10/order_constraint_stops_slave.summary

View Options

pengine/test10/ordered-set-basic-startup.summary

View Options

pengine/test10/ordered-set-natural.summary

View Options

pengine/test10/params-6.summary

View Options

pengine/test10/remote-disable.summary

View Options

pengine/test10/remote-orphaned2.dot

View Options

pengine/test10/remote-orphaned2.exp

View Options

pengine/test10/remote-orphaned2.scores

View Options

pengine/test10/remote-orphaned2.summary

View Options

pengine/test10/remote-orphaned2.xml

View Options

pengine/test10/rsc-maintenance.summary

View Options

pengine/test10/rsc-sets-clone-1.summary

View Options

pengine/test10/stopped-monitor-03.summary

View Options

pengine/test10/stopped-monitor-11.summary

View Options

pengine/test10/stopped-monitor-20.summary

View Options

pengine/test10/stopped-monitor-21.summary

View Options

pengine/test10/stopped-monitor-22.summary

View Options

pengine/test10/stopped-monitor-24.summary

View Options

pengine/test10/stopped-monitor-31.summary

View Options

pengine/test10/target-1.summary

View Options

pengine/test10/target-2.summary

View Options

pengine/test10/template-1.summary

View Options

pengine/test10/unmanaged-stop-1.summary

View Options

pengine/test10/unmanaged-stop-2.summary

View Options

pengine/test10/unmanaged-stop-3.summary

View Options

pengine/test10/unmanaged-stop-4.summary

View Options

pengine/test10/use-after-free-merge.summary

View Options

pengine/test10/utilization-order4.summary

View Options

pengine/test10/whitebox-asymmetric.summary

View Options

pengine/test10/whitebox-stop.summary

View Options

tools/crm_mon.c

View Options

tools/crm_standby

View Options

tools/fake_transition.c