Diffusion Pacemaker dec0b6841092

Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
dec0b6841092
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Apr 12 2015, 8:49 PM

Parents

rPd768c392e953: Merge pull request #681 from gao-yan/display-resource-unclean
rP64c8833b1df4: Fix: PE: Correctly compare feature set to determine how to unpack meta…

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

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

Changes (38)

Path

Size

cib/

extra/

resources/

lib/

cib/

pengine/

lrmd/

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-start-all.exp

master-7.summary

master-8.summary

rec-node-10.summary

rec-node-4.summary

rec-node-7.summary

rec-node-8.summary

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

rPdec0b6841092

cib/io.c

Loading...

extra/resources/docker-wrapper

Loading...

lib/cib/cib_file.c

Loading...

lib/pengine/clone.c

Loading...

lib/pengine/complex.c

Loading...

lib/pengine/native.c

Loading...

lrmd/remote_ctl.c

Loading...

mcp/pacemaker.combined.upstart.in

Loading...

pengine/native.c

Loading...

pengine/regression.sh

Loading...

pengine/test10/829.summary

Loading...

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

Loading...

pengine/test10/bug-cl-5212.summary

Loading...

pengine/test10/bug-lf-2508.summary

Loading...

pengine/test10/bug-lf-2551.summary

Loading...

pengine/test10/interleave-pseudo-stop.summary

Loading...

pengine/test10/isolation-clone.dot

Loading...

pengine/test10/isolation-clone.exp

Loading...

pengine/test10/isolation-clone.scores

Loading...

pengine/test10/isolation-clone.summary

Loading...

pengine/test10/isolation-clone.xml

Loading...

pengine/test10/isolation-restart-all.exp

Loading...

pengine/test10/isolation-start-all.exp

Loading...

pengine/test10/master-7.summary

Loading...

pengine/test10/master-8.summary

Loading...

pengine/test10/rec-node-10.summary

Loading...

pengine/test10/rec-node-4.summary

Loading...

pengine/test10/rec-node-7.summary

Loading...

pengine/test10/rec-node-8.summary

Loading...

pengine/test10/remote-fence-unclean.summary

Loading...

pengine/test10/remote-fence-unclean2.summary

Loading...

pengine/test10/remote-recover-fail.summary

Loading...

pengine/test10/remote-recover.summary

Loading...

pengine/test10/stonith-1.summary

Loading...

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

Loading...

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

Loading...

pengine/test10/unrunnable-1.summary

Loading...

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

Loading...