Diffusion Pacemaker bf30c6592e2d

Hg: Automated merge
bf30c6592e2d
Actions

Description

Hg: Automated merge

Mercurial revision: 35a74a1a63c879f6b8e44ed922d28ac18ffeddc0

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Apr 3 2009, 1:19 PM

Parents

rP60af6ba8d957: Low: packaging: install the filesystem template
rP6bb3e399448f: Low: cts: Heartbeat stack - Fix ComponentFail and disable the Reattach test

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

60af6ba8d957 Low: packaging: install the filesystem template
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
281e3c43de41 Low: Tools: crm: catch exceptions in case of os errors (templates)
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
02608f82d1aa Low: Tools: crm templates: add filesystem
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
461a13ac6b5f Medium: Tools: crm: rudimentary if-else for templates
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
f6af6c307692 Dev: Tools: crm: replace prefixes more thoroughly
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
ebce3dfeb63f Dev: Tools: crm: wrong template id set
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
7a22279e7dfc Low: Tools: crm templates: the ip address name is not that important
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
658982db0386 Low: Tools: crm: replace otherwise unused prefixes in templates
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
3bb98e154d68 High: Tools: crm: add and implement templates
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
66a03c39d0d6 Low: Tools: crm: add references to collocation
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
623b0716254b Low: Tools: crm_regression: move crm_regression files to tools/shell/regression
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits

Changes (33)

Path

Size

doc/

tools/

	shell/	regression/
		crm_regression/

	tools/	shell/
		extra/

Makefile.am

	tools/	shell/	templates/
	include/	crm/	pengine/

Makefile.am

rPbf30c6592e2d

View Options

doc/crm_cli.txt

View Options

pacemaker.spec

View Options

tools/Makefile.am

View Options

tools/crm.in

View Options

tools/crm_regression/001.exp.xml

View Options

tools/crm_regression/001.input

View Options

tools/crm_regression/002.exp.xml

View Options

tools/crm_regression/002.input

View Options

tools/crm_regression/003.exp.xml

View Options

tools/crm_regression/003.input

View Options

tools/crm_regression/004.exp.xml

View Options

tools/crm_regression/004.input

View Options

tools/crm_regression/crm_regression.sh

View Options

tools/crm_regression/shadow.base

View Options

tools/shell/Makefile.am

View Options

tools/shell/regression/001.exp.xml

View Options

tools/shell/regression/001.input

View Options

tools/shell/regression/002.exp.xml

View Options

tools/shell/regression/002.input

View Options

tools/shell/regression/003.exp.xml

View Options

tools/shell/regression/003.input

View Options

tools/shell/regression/004.exp.xml

View Options

tools/shell/regression/004.input

View Options

tools/shell/regression/crm_regression.sh

View Options

tools/shell/regression/shadow.base

View Options

tools/shell/templates/Makefile.am

View Options

tools/shell/templates/apache

View Options

tools/shell/templates/filesystem

View Options

tools/shell/templates/virtual-ip

Hg: Automated mergebf30c6592e2dActions

Description

Details

Event Timeline

Merged Changes

Changes (33)

rPbf30c6592e2d

doc/crm_cli.txt

pacemaker.spec

tools/Makefile.am

tools/crm.in

tools/crm_regression/001.exp.xml

tools/crm_regression/001.input

tools/crm_regression/002.exp.xml

tools/crm_regression/002.input

tools/crm_regression/003.exp.xml

tools/crm_regression/003.input

tools/crm_regression/004.exp.xml

tools/crm_regression/004.input

tools/crm_regression/crm_regression.sh

tools/crm_regression/shadow.base

tools/shell/Makefile.am

tools/shell/regression/001.exp.xml

tools/shell/regression/001.input

tools/shell/regression/002.exp.xml

tools/shell/regression/002.input

tools/shell/regression/003.exp.xml

tools/shell/regression/003.input

tools/shell/regression/004.exp.xml

tools/shell/regression/004.input

tools/shell/regression/crm_regression.sh

tools/shell/regression/shadow.base

tools/shell/templates/Makefile.am

tools/shell/templates/apache

tools/shell/templates/filesystem

tools/shell/templates/virtual-ip

Hg: Automated merge
bf30c6592e2d
Actions