Diffusion Pacemaker 367db782e8c7

Merge pull request #1003 from ClusterLabs/1.1
367db782e8c7
Actions

Description

Merge pull request #1003 from ClusterLabs/1.1

Update master to 1.1.15-rc2+

Details

Provenance

kgaillot

Authored on May 17 2016, 5:19 PM

Parents

rPdc7b9e2b9c10: Merge pull request #1004 from jnpkrn/build-make-srpm-pre-releases
rP88ac26d51b4c: Fix: uninitialized use of nano_digits

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

dc7b9e2b9c10 Merge pull request #1004 from jnpkrn/build-make-srpm-pre-releases
Author
kgaillot
Browse Repository
No Audits
6a967a932568 Build: let "make [s]rpm" use pre-/post-release logic from spec proper
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
5eab80c147ee Merge pull request #1005 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
44c40b58ef04 Fix: resources: use OCF version tagging correctly
Author
kgaillot
Browse Repository
No Audits
6b6de7f0e7e2 Doc: clarify failure-timeout and reconnect_interval depend on cluster-recheck…
Author
kgaillot
Browse Repository
No Audits
124e3f176cf4 Fix: libcommon: crm_procfs_pid_of() would always return last /proc entry checked
Author
kgaillot
Browse Repository
No Audits
468a1e03ae55 Merge pull request #1002 from kgaillot/1.1
Author
kgaillot
Browse Repository
No Audits
989df59f06e4 Doc: update change log for 1.1.15-rc2
Author
kgaillot
Browse Repository
No Audits
4112547c9cbb Merge pull request #1000 from wenningerk/alert_cleanup
Author
kgaillot
Browse Repository
No Audits
ef176b706a82 Fix: crmd: correctly dig into cib-query-answer if alerts section is present
Author
wenningerk
Browse Repository
No Audits
12f22486a646 Merge pull request #998 from gao-yan/env-CRM_meta_timeout
Author
kgaillot
Browse Repository
No Audits
f9be2d92bba9 Fix: crmd: Take start-delay into account for the timeout of the action timer
Author
gao-yan
Browse Repository
No Audits
332e880522b8 Test: pengine: lf#2560/lf#2588 - Correctly set the environment variable…
Author
gao-yan
Browse Repository
No Audits
2673f192d1f5 Test: pengine: lf#2560/lf#2588 - Correctly set the environment variable…
Author
gao-yan
Browse Repository
No Audits
959d160ea1cd Fix: pengine: lf#2560/lf#2588 - Correctly set the environment variable…
Author
gao-yan
Browse Repository
No Audits
87ed1edb115f Merge pull request #996 from credativ/init-stop-status
Author
kgaillot
Browse Repository
No Audits
238b62d47788 Fix init script return status
Author
Christian Schneider <christian.schneider@aoe.com>
Browse Repository
No Audits
c93f8ca159cb Merge pull request #995 from gao-yan/service-action-cleanup
Author
kgaillot
Browse Repository
No Audits
4c6e26904e03 Merge pull request #994 from jnpkrn/hide-cman-only-function
Author
kgaillot
Browse Repository
No Audits
1c3f6b5515f9 Fix: services: Correctly clean up service actions for non-dbus case
Author
gao-yan
Browse Repository
No Audits
26fb9be2b826 Low: hide the unused function when compiling w/o CMAN support
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
e9bab7dc107d Merge pull request #989 from gao-yan/attrd-sync-dampen
Author
kgaillot
Browse Repository
No Audits
c6c8cbc81ece Merge pull request #992 from wenningerk/alert_cleanup
Author
kgaillot
Browse Repository
No Audits
79dc73e7f3e4 some more renaming notify -> alert in the publicly exposed headers and sample…
Author
wenningerk
Browse Repository
No Audits
fa72a85c0e32 Fix: uninitialized use of nano_digits
Author
Lars Ellenberg <lars.ellenberg@linbit.com>
Browse Repository
No Audits
9e382568ac3c Merge pull request #990 from kgaillot/doc
Author
kgaillot
Browse Repository
No Audits
e5eda743fe09 Doc: update translation templates (.pot files) for 1.1.15
Author
kgaillot
Browse Repository
No Audits
9ce3d5b06ab6 Doc: Pacemaker Explained, Pacemaker Remote: update for 1.1.15
Author
kgaillot
Browse Repository
No Audits
daeb086b19c0 Fix: attrd: Update also dampens when synchronizing attributes
Author
gao-yan
Browse Repository
No Audits
ef0b52603a15 Merge pull request #982 from gao-yan/attrd-sync-attributes
Author
kgaillot
Browse Repository
No Audits
1c780c3933be Merge pull request #987 from gao-yan/anti-colocation-slave
Author
kgaillot
Browse Repository
No Audits
8910b9459c8a Merge pull request #988 from gao-yan/SysInfo-#health_disk
Author
kgaillot
Browse Repository
No Audits
2a7966768071 Fix: RA: SysInfo - Reset the node attribute "#health_disk" to "green" when…
Author
gao-yan
Browse Repository
No Audits
39586d81d3ca Test: pengine: Organize order of actions for slave resources in anti-colocations
Author
gao-yan
Browse Repository
No Audits
588247ddf366 Fix: pengine: Organize order of actions for slave resources in anti-colocations
Author
gao-yan
Browse Repository
No Audits
a484303f6b12 High: attrd: Fix the synchronization of attributes
Author
gao-yan
Browse Repository
No Audits
f8b693427db9 Merge pull request #986 from gao-yan/anti-colocation-master
Author
kgaillot
Browse Repository
No Audits
85f61f3701d5 Merge pull request #985 from gao-yan/asymmetrical-order-move
Author
kgaillot
Browse Repository
No Audits
27f905524825 Merge pull request #983 from jnpkrn/build-spec-prereleases-support
Author
kgaillot
Browse Repository
No Audits
5904552658c9 Test: pengine: Organize order of actions for master resources in anti…
Author
gao-yan
Browse Repository
No Audits
386eb49271fc Fix: pengine: Organize order of actions for master resources in anti-colocations
Author
gao-yan
Browse Repository
No Audits
1f2e34921c4d Test: pengine: Respect asymmetrical ordering when trying to move resources
Author
gao-yan
Browse Repository
No Audits
cb335e317187 Test: pengine: Respect asymmetrical ordering when trying to move resources…
Author
gao-yan
Browse Repository
No Audits
0c7571844bac Fix: pengine: Respect asymmetrical ordering when trying to move resources
Author
gao-yan
Browse Repository
No Audits
5401f3bf6ef3 Build: spec: establish support for tagged -rcX pre-releases
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
44bbb9b82580 Build: make spec's shortcommit/GNUmakefile's SHORTTAG handle -rcX tags
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
2902a0b478dd Build: make SHORTTAG properly derived from TAG for sure
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
6c3731d829b4 Build: new COMMIT variable possibly influencing TAG one
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits

Changes (148)

Path

Size

attrd/

crmd/

doc/

Clusters_from_Scratch/

pot/

Ch-Active-Passive.pot

Ch-Apache.pot

Ch-Installation.pot

Ch-Intro.pot

Ch-Shared-Storage.pot

Ch-Stonith.pot

Ch-Tools.pot

Ch-Verification.pot

Clusters_from_Scratch.pot

Preface.pot

Revision_History.pot

Pacemaker_Explained/

en-US/

pot/

Ap-Upgrade-Config.pot

Ap-Upgrade.pot

Author_Group.pot

Book_Info.pot

Ch-Advanced-Options.pot

Ch-Advanced-Resources.pot

Ch-Basics.pot

Ch-Constraints.pot

Ch-Intro.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/

Book_Info.xml

Ch-Alternatives.txt

Ch-Baremetal-Tutorial.txt

Ch-Baremetal-Tutorial.pot

	Pacemaker_Remote/	pot/
	Clusters_from_Scratch/	pot/

Revision_History.pot

extra/

alerts/

resources/

include/

crm/

msg_xml.h

lib/

cluster/

common/

pengine/

services/

transition/

mcp/

pengine/

test10/

anti-colocation-master.dot

anti-colocation-master.exp

anti-colocation-master.scores

anti-colocation-master.summary

anti-colocation-master.xml

anti-colocation-slave.dot

anti-colocation-slave.exp

anti-colocation-slave.scores

anti-colocation-slave.summary

anti-colocation-slave.xml

asymmetrical-order-move.dot

asymmetrical-order-move.exp

asymmetrical-order-move.scores

asymmetrical-order-move.summary

asymmetrical-order-move.xml

bug-5014-CLONE-A-stop-B-started.dot

bug-5014-GROUP-A-stopped-B-started.dot

clone-anon-failcount.exp

clone-no-shuffle.exp

clone-no-shuffle.xml

coloc-clone-stays-active.xml

coloc-slave-anti.exp

coloc-slave-anti.xml

colocate-primitive-with-clone.exp

group-dependents.exp

group-dependents.xml

master-asymmetrical-order.dot

master-partially-demoted-group.exp

one-or-more-unrunnnable-instances.exp

one-or-more-unrunnnable-instances.xml

order-serialize-set.exp

rP367db782e8c7

View Options

ChangeLog

View Options

GNUmakefile

View Options

attrd/commands.c

View Options

crmd/cib.c

View Options

crmd/control.c

View Options

crmd/notify.c

View Options

crmd/notify.h

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/Clusters_from_Scratch.pot

View Options

doc/Clusters_from_Scratch/pot/Preface.pot

View Options

doc/Clusters_from_Scratch/pot/Revision_History.pot

View Options

doc/Pacemaker_Explained/en-US/Book_Info.xml

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-Stonith.txt

View Options

doc/Pacemaker_Explained/en-US/Revision_History.xml

View Options

doc/Pacemaker_Explained/pot/Ap-Changes.pot

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-Config.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-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-Alternatives.txt

View Options

doc/Pacemaker_Remote/en-US/Ch-Baremetal-Tutorial.txt

View Options

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

View Options

doc/Pacemaker_Remote/en-US/Ch-KVM-Tutorial.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

extra/alerts/pcmk_alert_sample.sh

View Options

extra/alerts/pcmk_snmp_helper.sh

View Options

extra/resources/ClusterMon

View Options

extra/resources/HealthCPU

View Options

extra/resources/HealthSMART

View Options

extra/resources/SysInfo

View Options

extra/resources/SystemHealth

View Options

extra/resources/ifspeed

View Options

extra/resources/o2cb

View Options

extra/resources/ping

View Options

extra/resources/pingd

View Options

extra/resources/remote

View Options

include/crm/msg_xml.h

View Options

lib/cluster/legacy.c

View Options

lib/common/procfs.c

View Options

lib/pengine/utils.c

View Options

lib/services/services.c

View Options

lib/transition/unpack.c

View Options

mcp/pacemaker.in

View Options

pacemaker.spec.in

View Options

pengine/constraints.c

View Options

pengine/native.c

View Options

pengine/regression.sh

View Options

pengine/test10/anti-colocation-master.dot

View Options

pengine/test10/anti-colocation-master.exp

View Options

pengine/test10/anti-colocation-master.scores

View Options

pengine/test10/anti-colocation-master.summary

View Options

pengine/test10/anti-colocation-master.xml

View Options

pengine/test10/anti-colocation-slave.dot

View Options

pengine/test10/anti-colocation-slave.exp

View Options

pengine/test10/anti-colocation-slave.scores

View Options

pengine/test10/anti-colocation-slave.summary

View Options

pengine/test10/anti-colocation-slave.xml

View Options

pengine/test10/asymmetrical-order-move.dot

View Options

pengine/test10/asymmetrical-order-move.exp

View Options

pengine/test10/asymmetrical-order-move.scores

View Options

pengine/test10/asymmetrical-order-move.summary

View Options

pengine/test10/asymmetrical-order-move.xml

View Options

pengine/test10/bnc-515172.exp

View Options

pengine/test10/bnc-515172.xml

View Options

pengine/test10/bug-1572-1.exp

View Options

pengine/test10/bug-1820-1.exp

View Options

pengine/test10/bug-1820.exp

View Options

pengine/test10/bug-5014-CLONE-A-stop-B-started.dot

View Options

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

View Options

pengine/test10/bug-lf-2317.xml

View Options

pengine/test10/bug-lf-2422.exp

View Options

pengine/test10/bug-n-385265-2.exp

View Options

pengine/test10/bug-n-385265.xml

View Options

pengine/test10/bug-n-387749.exp

View Options

pengine/test10/clone-anon-failcount.exp

View Options

pengine/test10/clone-no-shuffle.exp

View Options

pengine/test10/clone-no-shuffle.xml

View Options

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

View Options

pengine/test10/coloc-slave-anti.exp

View Options

pengine/test10/coloc-slave-anti.xml

View Options

pengine/test10/colocate-primitive-with-clone.exp

View Options

pengine/test10/group-dependents.exp

View Options

pengine/test10/group-dependents.xml

View Options

pengine/test10/master-asymmetrical-order.dot

View Options

pengine/test10/master-partially-demoted-group.exp

View Options

pengine/test10/one-or-more-unrunnnable-instances.exp

View Options

pengine/test10/one-or-more-unrunnnable-instances.xml

View Options

pengine/test10/order-serialize-set.exp

View Options

pengine/test10/order-serialize.exp

View Options

pengine/test10/origin.exp

View Options

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

View Options

pengine/test10/systemhealth2.exp

View Options

pengine/test10/systemhealth3.exp

View Options

pengine/test10/systemhealthm2.exp

View Options

pengine/test10/systemhealthn2.exp

View Options

pengine/test10/systemhealthn3.exp

View Options

pengine/test10/systemhealthp2.exp

Merge pull request #1003 from ClusterLabs/1.1367db782e8c7Actions

Description

Details

Event Timeline

Merged Changes

Changes (148)

rP367db782e8c7

ChangeLog

GNUmakefile

attrd/commands.c

crmd/cib.c

crmd/control.c

crmd/notify.c

crmd/notify.h

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/Clusters_from_Scratch.pot

doc/Clusters_from_Scratch/pot/Preface.pot

doc/Clusters_from_Scratch/pot/Revision_History.pot

doc/Pacemaker_Explained/en-US/Book_Info.xml

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

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

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

doc/Pacemaker_Explained/en-US/Revision_History.xml

doc/Pacemaker_Explained/pot/Ap-Changes.pot

doc/Pacemaker_Explained/pot/Ap-Debug.pot

doc/Pacemaker_Explained/pot/Ap-FAQ.pot

doc/Pacemaker_Explained/pot/Ap-Install.pot

doc/Pacemaker_Explained/pot/Ap-LSB.pot

doc/Pacemaker_Explained/pot/Ap-OCF.pot

doc/Pacemaker_Explained/pot/Ap-Samples.pot

doc/Pacemaker_Explained/pot/Ap-Upgrade-Config.pot

doc/Pacemaker_Explained/pot/Ap-Upgrade.pot

doc/Pacemaker_Explained/pot/Author_Group.pot

doc/Pacemaker_Explained/pot/Book_Info.pot

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

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

doc/Pacemaker_Explained/pot/Ch-Basics.pot

doc/Pacemaker_Explained/pot/Ch-Constraints.pot

doc/Pacemaker_Explained/pot/Ch-Intro.pot

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

doc/Pacemaker_Explained/pot/Ch-Nodes.pot

doc/Pacemaker_Explained/pot/Ch-Notifications.pot

doc/Pacemaker_Explained/pot/Ch-Options.pot

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

doc/Pacemaker_Explained/pot/Ch-Resources.pot

doc/Pacemaker_Explained/pot/Ch-Rules.pot

doc/Pacemaker_Explained/pot/Ch-Status.pot

doc/Pacemaker_Explained/pot/Ch-Stonith.pot

doc/Pacemaker_Explained/pot/Ch-Utilization.pot

doc/Pacemaker_Explained/pot/Pacemaker_Explained.pot

doc/Pacemaker_Explained/pot/Preface.pot

doc/Pacemaker_Explained/pot/Revision_History.pot

doc/Pacemaker_Remote/en-US/Book_Info.xml

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

doc/Pacemaker_Remote/en-US/Ch-Baremetal-Tutorial.txt

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

doc/Pacemaker_Remote/en-US/Ch-KVM-Tutorial.txt

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

doc/Pacemaker_Remote/en-US/Revision_History.xml

doc/Pacemaker_Remote/pot/Author_Group.pot

doc/Pacemaker_Remote/pot/Book_Info.pot

doc/Pacemaker_Remote/pot/Ch-Alternatives.pot

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

doc/Pacemaker_Remote/pot/Ch-Example.pot

doc/Pacemaker_Remote/pot/Ch-Intro.pot

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

doc/Pacemaker_Remote/pot/Ch-Options.pot

Merge pull request #1003 from ClusterLabs/1.1
367db782e8c7
Actions