Diffusion Pacemaker 5b7983a0f818

Merge branch 'master' of github.com:ClusterLabs/pacemaker
5b7983a0f818
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 27 2014, 10:38 PM

Parents

rPdce6161cfae3: Merge pull request #471 from AnchorCat/shadow-reset
rPd200ed0cdab5: Fix: xml: Allow first-acl-match-wins semantics to be supported if desired

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

dce6161cfae3 Merge pull request #471 from AnchorCat/shadow-reset
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5492b217f6f3 tools: fix "crm_shadow --reset <name>"
Author
Michael Chapman <mike@very.puzzling.org>
Browse Repository
No Audits
05f5af8241ea Merge pull request #470 from davidvossel/controld_fixes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
20472946f54b Low: controld: Remove '-q 0' from default dlm_controld arguments
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e473bc581ba0 Merge pull request #469 from krig/pcs-crmsh-updates
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6a0d9e215c0c Doc: flip colocation example to match pcs version
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
c1ebb125aecb Update TOC
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
aa8835a09194 Update pcs-crmsh-quick-ref.md with crmsh equivalents
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
bfbc1de266fe Merge pull request #468 from oallart/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
cd8ef5352e49 fix: pcs-crmsh-quick-ref.md: List RA info
Author
Olivier Allart <olivier.allart@eyecon.com.au>
Browse Repository
No Audits
2b1bb4f0d948 Merge pull request #466 from oallart/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c901280da427 Moved TOC tool link to comments
Author
Olivier Allart <olivier.allart@eyecon.com.au>
Browse Repository
No Audits
8228a88515f7 Reformatted pcs-crmsh-quick-ref.md with more detail, updated toc
Author
Olivier Allart <olivier.allart@eyecon.com.au>
Browse Repository
No Audits
135133b42c2f Reformatted pcs-crmsh-quick-ref.md with more detail
Author
Olivier Allart <olivier.allart@eyecon.com.au>
Browse Repository
No Audits
8bee850bb95e Merge pull request #465 from davidvossel/bz1078504-11node-clone
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9321a750e4cd Low: pengine: ordered 16 clone instance regression test
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9e0b496b269c Fix: pengine: fixes invalid transition caused by clones with more than 10…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
3f34b357d3b5 Merge pull request #464 from inouekazu/proper_log
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
15e91c6eb05f Merge pull request #462 from davidvossel/lrm-segfault
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9c7634e2c26b Fix: services_action_cancel: Interpret return code from mainloop_child_kill()…
Author
inouekazu
Browse Repository
No Audits
8cb402f0fd2e Low: operation_finished: Reduce log level 'terminated with signal' at the time…
Author
inouekazu
Browse Repository
No Audits
59eafc676c22 Low: fencing: make hashtable mapping hostname->alias case insensitive for…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
c118ac5b5244 Low: attrd: Make hostname hashtable case insensitive
Author
inouekazu
Browse Repository
No Audits
8314d25fc1cd Low: membership: make caching peers by uname case insensitive
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
cc8cbd66e84b Fix: crmd: make lrm_state hash table not case sensitive
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (19)

Path

Size

attrd/

crmd/

doc/

pcs-crmsh-quick-ref.md

extra/

resources/

fencing/

include/

crm/

common/

lib/

cluster/

common/

services/

services_linux.c

pengine/

test10/

clone-order-16instances.dot

clone-order-16instances.exp

clone-order-16instances.scores

clone-order-16instances.summary

clone-order-16instances.xml

tools/

rP5b7983a0f818

attrd/commands.c

Loading...

crmd/lrm_state.c

Loading...

doc/pcs-crmsh-quick-ref.md

Loading...

extra/resources/controld

Loading...

fencing/commands.c

Loading...

include/crm/common/util.h

Loading...

include/crm/crm.h

Loading...

lib/cluster/membership.c

Loading...

lib/common/utils.c

Loading...

lib/services/services.c

Loading...

lib/services/services_linux.c

Loading...

pengine/clone.c

Loading...

pengine/regression.sh

Loading...

pengine/test10/clone-order-16instances.dot

Loading...

pengine/test10/clone-order-16instances.exp

Loading...

pengine/test10/clone-order-16instances.scores

Loading...

pengine/test10/clone-order-16instances.summary

Loading...

pengine/test10/clone-order-16instances.xml

Loading...

tools/cib_shadow.c

Loading...