Diffusion Pacemaker 5ebc8d0bebdd

Hg: Automated merge
5ebc8d0bebdd
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Hg: Automated merge

Mercurial revision: 530add2a3721a0ecccb24660a97dbfdaa3e68f51

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Feb 23 2010, 10:32 AM

Parents

rP8d3ae201c4e1: Hg: Automated merge
rP7938996775ab: Medium: Shell: update supported CIB RE to include pacemaker 1.1 and 1.2

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

8d3ae201c4e1 Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
159c46accf2e Dev: cts: Fix up log watching
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
17be86e70d74 Medium: crmd: Bug bnc#578644 - Don't send operation updates for deleted…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
fb81d45e2137 Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
dd4747604c77 Low: cts: Simplify the remote logger
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7d69560ae0dc Medium: Build: Improved check for the correct uint64_t print format
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d6132d223cc6 High: PE: Correctly implement optional colocation between primitives and clone…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
73d71204eef0 Low: doc: fix rule in one location example
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
c0867b9071de Low: doc: Include a link to the LSB spec in the appendix for testing…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
80f29ea0ac42 Low: cts: Auto-detect the type of logging
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
27f74c322b05 Low: RA: controld - Choose better defaults if the resource name contains gfs
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
cfc469d9f022 Medium: Core: Give signal handlers higher priority - patch based on Lars…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c73252b7fc9a Dev: ais: Fix the child shutdown escalation logic
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits

Changes (16)

Path

Size

crmd/

cts/

doc/

Pacemaker_Explained/

en-US/

extra/

resources/

lib/

common/

pengine/

test10/

colocate-primitive-with-clone.dot

colocate-primitive-with-clone.exp

colocate-primitive-with-clone.scores

colocate-primitive-with-clone.xml

rP5ebc8d0bebdd

configure.ac

Loading...

crmd/lrm.c

Loading...

cts/CTS.py

Loading...

cts/CTSaudits.py

Loading...

cts/CTSlab.py

Loading...

cts/CTStests.py

Loading...

doc/Pacemaker_Explained/en-US/Ap-LSB.xml

Loading...

doc/crm_cli.txt

Loading...

extra/resources/controld

Loading...

lib/common/mainloop.c

Loading...

pengine/native.c

Loading...

pengine/regression.sh

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...