Diffusion Pacemaker da8f0fb69163

Merge ../1.1
da8f0fb69163
Actions

Description

Merge ../1.1

Conflicts:
tools/crm_resource.c

Remove all the '\n' characters and have the CMD_ERR macro insert them
when appropriate

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Apr 14 2015, 11:20 PM

Parents

rP90aee2283257: Doc: fencing: Clarify that stonith-timeout only applies to reboot/on/off actions
rP5df2add4e206: Fix: crm_report: Allow log file discovery to be disabled

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

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

90aee2283257 Doc: fencing: Clarify that stonith-timeout only applies to reboot/on/off actions
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7a2e3ae6b736 Test: PE: Change the feature set, saves recalculating all the digests
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
dec0b6841092 Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
64c8833b1df4 Fix: PE: Correctly compare feature set to determine how to unpack meta…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d768c392e953 Merge pull request #681 from gao-yan/display-resource-unclean
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
efb476c4b601 Merge pull request #683 from kgaillot/fixes-1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d44d60e414d2 Merge pull request #684 from HideoYamauchi/1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9fe0444430d5 Low: mcp: Add 'start on started local and runlevel' to Upstart job.
Author
HideoYamauchi
Browse Repository
No Audits
654188fdcdb7 Merge pull request #682 from davidvossel/pcmk-docker-bff
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e4ec49fe7651 Log: cib: restore read-and-verify logging to 1.1.12 verbosity
Author
kgaillot
Browse Repository
No Audits
4c54e5c175ff Low: docker-wrapper: per resource logging of lrmd and remote client tool
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
682ce58b0449 Low: docker-wrapper: update meta-data documentation
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5474be99ee63 Test: pengine: cl#5207 - Display "UNCLEAN" for resources running on unclean…
Author
gao-yan
Browse Repository
No Audits
f3aa9db858ba Fix: pengine: Avoid trailing whitespaces when printing resource state
Author
gao-yan
Browse Repository
No Audits
12e27be9e202 Low: docker-wrapper: for non priviledged mode, make sure to record stdout so…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
c76cb91a45f4 Feature: pengine: cl#5207 - Display "UNCLEAN" for resources running on unclean…
Author
gao-yan
Browse Repository
No Audits
2709b23f633d Low: docker-wrapper: refactor wrapper arg prefix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
d03c2dc88f53 Low: docker-wrapper: add reuse option for presistent containers
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
3263963bf0f5 Merge pull request #678 from davidvossel/pcmk-docker-bff
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
61eb5935b977 Low: docker-wrapper: only override exit reason if docker daemon is inactive
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7e15a4c96514 Build: Bump the library versions as appropriate
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6891eb102f82 Build: Make the bumplibs script smarter
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
3cf5ba7c407a Merge pull request #674 from kgaillot/fixes-1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2ab1daa02a24 Merge pull request #676 from kgaillot/timeout-1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
738865d7a3b9 Log: cib: cib_file_read_and_verify doesn't need to be this verbose
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
96427ec3d1c8 Fix: crm_report: More patterns for finding logs on non-DC nodes
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
087772e0f18f Build: update libtool versions for 1.1.13 release
Author
kgaillot
Browse Repository
No Audits
854235216b28 Low: pengine: regression test update for new cloned isolated instance name
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f8a36953b476 High: pengine: handle isolated resource scenario, cloned group of isolated…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
454a2824068c Low: pengine: regression test for cloned isolated primitive
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f4f5d4b7ee1b Low: pengine: update isolation rsc tests for isolation host feature
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
ed8a589efb42 High: pengine: handle cloned isolated resources in a sane way
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
35e2d8ff0672 Fix: PE: Turn off legacy unpacking of resource options into the meta hashtable
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d8cc73871dc2 Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
84ac07c7d02b Fix: acl: Do not delay evaluation of added nodes in some situations
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
45ae97eb74d4 Merge pull request #677 from davidvossel/attrd-double-free-fix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
070aef26c87f Merge pull request #675 from davidvossel/pcmk-docker-bff
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
1fe59779d9b7 High: docker-wrapper: add demote, promote, and notify actions for multistate rsc
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
61a14e363a57 High: docker-wrapper: properly forward key value pairs during isolation
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e64981afbabd Fix: attrd: fixes double free in attrd legacy
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e52eef127b97 Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d53d5cd0ab25 Build: Turn on travis builds for the 1.1 branch
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
3084b28e6711 High: lrmd: do not let isolation wrappers inherit the wrapper attribute, or it…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
c960dc63d185 Fix: lrmd: Use original timestamps when reporting multi-step systemd operations
Author
kgaillot
Browse Repository
No Audits
8c895f37e0d6 High: pengine: pass node name of pcmk host into isolated resources
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
1db5ea310868 Refactor: lrmd: let time_diff_ms() take NULL first argument as "now"
Author
kgaillot
Browse Repository
No Audits
36879900da27 Fix: lrmd: report original timeout when systemd operation completes
Author
kgaillot
Browse Repository
No Audits
090675ac255a Fix: lrmd: guard timeb-dependent code
Author
kgaillot
Browse Repository
No Audits
ce1a61111aea High: lrmd: isolation wrappers are moved from containers to isolation OCF…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
124bfe5ffa74 Refactor: lrmd: merge two overlapping functions
Author
kgaillot
Browse Repository
No Audits

Changes (77)

Path

Size

attrd/

cib/

doc/

Clusters_from_Scratch/

en-US/

Ch-Stonith.txt

Pacemaker_Explained/

en-US/

Ch-Options.txt

Ch-Stonith.txt

extra/

resources/

fencing/

include/

crm/

msg_xml.h

services.h

lib/

cib/

cluster/

common/

fencing/

lrmd/

pengine/

services/

transition/

lrmd/

pacemaker_remote.service.in

remote_ctl.c

mcp/

pacemaker.combined.upstart.in

pengine/

test10/

bug-5186-partial-migrate.summary

bug-cl-5212.summary

bug-lf-2508.summary

bug-lf-2551.summary

interleave-pseudo-stop.summary

isolation-clone.dot

isolation-clone.exp

isolation-clone.scores

isolation-clone.summary

isolation-clone.xml

isolation-restart-all.exp

isolation-restart-all.xml

isolation-start-all.exp

isolation-start-all.xml

remote-fence-unclean.summary

remote-fence-unclean2.summary

remote-recover-fail.summary

remote-recover.summary

stonith-1.summary

stop-failure-no-fencing.summary

stop-failure-no-quorum.summary

unrunnable-1.summary

whitebox-imply-stop-on-fence.summary

tools/

crm_resource.c

report.collector

rPda8f0fb69163

View Options

.gitignore

View Options

.travis.yml

View Options

Doxyfile.in

View Options

GNUmakefile

View Options

attrd/legacy.c

View Options

bumplibs.sh

View Options

cib/callbacks.c

View Options

cib/io.c

View Options

cib/main.c

View Options

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

View Options

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

View Options

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

View Options

extra/resources/Makefile.am

View Options

extra/resources/docker-wrapper

View Options

fencing/commands.c

View Options

fencing/main.c

View Options

include/crm/msg_xml.h

View Options

include/crm/services.h

View Options

lib/cib/Makefile.am

View Options

lib/cib/cib_file.c

View Options

lib/cluster/Makefile.am

View Options

lib/cluster/cluster.c

View Options

lib/common/Makefile.am

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/common.c

View Options

lib/pengine/complex.c

View Options

lib/pengine/native.c

View Options

lib/pengine/unpack.c

View Options

lib/services/Makefile.am

View Options

lib/transition/Makefile.am

View Options

lrmd/lrmd.c

View Options

lrmd/lrmd_private.h

View Options

lrmd/pacemaker_remote.service.in

View Options

lrmd/remote_ctl.c

View Options

mcp/pacemaker.combined.upstart.in

View Options

mcp/pacemaker.service.in

View Options

pacemaker.spec.in

View Options

pengine/Makefile.am

View Options

pengine/graph.c

View Options

pengine/native.c

View Options

pengine/regression.sh

View Options

pengine/test10/829.summary

View Options

pengine/test10/bug-5186-partial-migrate.summary

View Options

pengine/test10/bug-cl-5212.summary

View Options

pengine/test10/bug-lf-2508.summary

View Options

pengine/test10/bug-lf-2551.summary

View Options

pengine/test10/interleave-pseudo-stop.summary

View Options

pengine/test10/isolation-clone.dot

View Options

pengine/test10/isolation-clone.exp

View Options

pengine/test10/isolation-clone.scores

View Options

pengine/test10/isolation-clone.summary

View Options

pengine/test10/isolation-clone.xml

View Options

pengine/test10/isolation-restart-all.exp

View Options

pengine/test10/isolation-restart-all.xml

View Options

pengine/test10/isolation-start-all.exp

View Options

pengine/test10/isolation-start-all.xml

View Options

pengine/test10/master-7.summary

View Options

pengine/test10/master-8.summary

View Options

pengine/test10/rec-node-10.summary

View Options

pengine/test10/rec-node-4.summary

View Options

pengine/test10/rec-node-7.summary

View Options

pengine/test10/rec-node-8.summary

View Options

pengine/test10/remote-fence-unclean.summary

View Options

pengine/test10/remote-fence-unclean2.summary

View Options

pengine/test10/remote-recover-fail.summary

View Options

pengine/test10/remote-recover.summary

View Options

pengine/test10/stonith-1.summary

View Options

pengine/test10/stop-failure-no-fencing.summary

View Options

pengine/test10/stop-failure-no-quorum.summary

View Options

pengine/test10/unrunnable-1.summary

View Options

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

View Options

tools/crm_resource.c

View Options

Merge ../1.1da8f0fb69163Actions

Description

Details

Event Timeline

Merged Changes

Changes (77)

rPda8f0fb69163

.gitignore

.travis.yml

Doxyfile.in

GNUmakefile

attrd/legacy.c

bumplibs.sh

cib/callbacks.c

cib/io.c

cib/main.c

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

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

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

extra/resources/Makefile.am

extra/resources/docker-wrapper

fencing/commands.c

fencing/main.c

include/crm/msg_xml.h

include/crm/services.h

lib/cib/Makefile.am

lib/cib/cib_file.c

lib/cluster/Makefile.am

lib/cluster/cluster.c

lib/common/Makefile.am

lib/common/xml.c

lib/fencing/Makefile.am

lib/lrmd/Makefile.am

lib/pengine/Makefile.am

lib/pengine/clone.c

lib/pengine/common.c

lib/pengine/complex.c

lib/pengine/native.c

lib/pengine/unpack.c

lib/services/Makefile.am

lib/transition/Makefile.am

lrmd/lrmd.c

lrmd/lrmd_private.h

lrmd/pacemaker_remote.service.in

lrmd/remote_ctl.c

mcp/pacemaker.combined.upstart.in

mcp/pacemaker.service.in

pacemaker.spec.in

pengine/Makefile.am

pengine/graph.c

pengine/native.c

pengine/regression.sh

pengine/test10/829.summary

pengine/test10/bug-5186-partial-migrate.summary

pengine/test10/bug-cl-5212.summary

pengine/test10/bug-lf-2508.summary

pengine/test10/bug-lf-2551.summary

pengine/test10/interleave-pseudo-stop.summary

pengine/test10/isolation-clone.dot

pengine/test10/isolation-clone.exp

pengine/test10/isolation-clone.scores

pengine/test10/isolation-clone.summary

pengine/test10/isolation-clone.xml

pengine/test10/isolation-restart-all.exp

pengine/test10/isolation-restart-all.xml

pengine/test10/isolation-start-all.exp

pengine/test10/isolation-start-all.xml

pengine/test10/master-7.summary

pengine/test10/master-8.summary

pengine/test10/rec-node-10.summary

pengine/test10/rec-node-4.summary

pengine/test10/rec-node-7.summary

pengine/test10/rec-node-8.summary

pengine/test10/remote-fence-unclean.summary

pengine/test10/remote-fence-unclean2.summary

pengine/test10/remote-recover-fail.summary

pengine/test10/remote-recover.summary

pengine/test10/stonith-1.summary

pengine/test10/stop-failure-no-fencing.summary

pengine/test10/stop-failure-no-quorum.summary

Merge ../1.1
da8f0fb69163
Actions