Diffusion Pacemaker d72ddc6ca554

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

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Mar 12 2015, 4:03 PM

Parents

rPce0980220db0: Merge pull request #664 from kgaillot/wait
rP4af63e481907: Feature: PE: Support non-actionable degraded mode for OCF

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

ce0980220db0 Merge pull request #664 from kgaillot/wait
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1f18016a4717 Merge pull request #655 from kgaillot/attrd
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
901cedf3668d Merge pull request #667 from kgaillot/doc
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
62baa038f6db Fix: doc: correct errors in doxygen comment blocks
Author
kgaillot
Browse Repository
No Audits
d9517ec4f37f doc: update Doxyfile to doxygen 1.8.5
Author
kgaillot
Browse Repository
No Audits
af718cffb618 Merge pull request #661 from kgaillot/doc
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
72223f67b88c Merge pull request #663 from davidvossel/clone-notify-env
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
424afcdf0e45 Feature: tools: add crm_resource --wait option
Author
kgaillot
Browse Repository
No Audits
9dfa3b6efb8a Refactor: tools: guard crm_resource actions with booleans rather than comparing…
Author
kgaillot
Browse Repository
No Audits
4657e2f73835 Fix: attrd: b22b1fe did uuid test too early
Author
kgaillot
Browse Repository
No Audits
3c998292b7a0 Feature: tools: attrd_updater supports --query and --all options
Author
kgaillot
Browse Repository
No Audits
564e0b57a6bf tools: attrd_updater: refactor and improve option help messages
Author
kgaillot
Browse Repository
No Audits
a941377bc084 Feature: attrd supports queries
Author
kgaillot
Browse Repository
No Audits
cfefd79975e2 Refactor: tools: functionize working set logic in crm_resource
Author
kgaillot
Browse Repository
No Audits
1c6165a94f34 Low: pengine: regression test for master promotion with notify
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
2cd8cd1cbe3a Fix: pengine: remove unnecessary whitespace from notify environment variables
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b15044a358ce doc: minor clarifications to Pacemaker Explained's Multi-Site Clusters chapter
Author
kgaillot
Browse Repository
No Audits
622f276c9b77 Merge pull request #660 from kgaillot/wait
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a2a68bda9a05 Fix: tools: free allocated memory correctly in crm_resource
Author
kgaillot
Browse Repository
No Audits
dd39b01a083c tools: Clarify logic in crm_resource with comments and defined constant
Author
kgaillot
Browse Repository
No Audits
ceaddda13455 Fix: tools: typos in crm_resource help text and comments
Author
kgaillot
Browse Repository
No Audits
5c4a5a9894b4 Merge pull request #657 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
4ed91da1c29e Merge pull request #659 from kgaillot/doc
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4df75cd46cc5 doc: minor corrections to Pacemaker Explained
Author
kgaillot
Browse Repository
No Audits
b22b1feedad8 Fix: attrd: properly write attributes for peers once uuid is discovered
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
460fffe80464 Merge pull request #658 from kgaillot/doc
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
633b81d85175 doc: minor clarifications to Pacemaker Explained
Author
kgaillot
Browse Repository
No Audits

Changes (23)

Path

Size

attrd/

doc/

Pacemaker_Explained/

en-US/

Ch-Advanced-Options.txt

Ch-Multi-site-Clusters.txt

Ch-Resources.txt

Ch-Utilization.txt

include/

crm/

pengine/

test10/

master-notify.dot

master-notify.exp

master-notify.scores

master-notify.summary

master-notify.xml

tools/

attrd_updater.c

rPd72ddc6ca554

.gitignore

Loading...

Doxyfile.in

Loading...

attrd/commands.c

Loading...

attrd/internal.h

Loading...

attrd/main.c

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

doc/Pacemaker_Explained/en-US/NOTES

Loading...

include/crm/lrmd.h

Loading...

include/crm/services.h

Loading...

include/doxygen.h

Loading...

pengine/allocate.c

Loading...

pengine/regression.sh

Loading...

pengine/test10/master-notify.dot

Loading...

pengine/test10/master-notify.exp

Loading...

pengine/test10/master-notify.scores

Loading...

pengine/test10/master-notify.summary

Loading...

pengine/test10/master-notify.xml

Loading...

tools/attrd_updater.c

Loading...

tools/crm_resource.c

Loading...