Diffusion Pacemaker 8ae45302394b

Merge ../1.1
8ae45302394b
Actions

Description

Merge ../1.1

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on May 11 2015, 9:13 PM

Parents

rP05e7ef67e455: Build: Update rpmlint suppresssions
rPa78b289fb34c: CTS: Fix installation helper

Branches

Tags

Event Timeline

Merged Changes

05e7ef67e455 Build: Update rpmlint suppresssions
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
04a2ba60102d Build: CRM_STATE_DIR is created dynamically when needed
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
359e080e266d Tools: Repair expected output for ACLs
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2dbc616635be Build: Ensure all spec files contain a changelog
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b158ecf71d28 Build: Prevent rpm packaging conflicts
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b7e7046e7bd1 Build: Generate a temporary changelog each time
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c071e92b065a Build: Attempt to repair srpm generation for buildbot
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
fbc239b4f56d Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c9ad9cd503f0 Merge pull request #704 from gao-yan/sort_rsc_process_order
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9470f07c91f8 Merge pull request #707 from kgaillot/onfail
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
188337e5f6f2 Build: Another travis update
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e9fa44f3a0e5 Refactor: crmd/pengine: implement on-fail=ignore without allow-fail
Author
kgaillot
Browse Repository
No Audits
f59634af41f6 Fix: pengine: Prevent use-after-free in sort_rsc_process_order()
Author
gao-yan
Browse Repository
No Audits
d15208c75021 Merge branch 'colocated-utilization' of https://github.com/gao-yan/pacemaker…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a67443d8580e Test: pengine: cl#5130 - Choose nodes capable of running all the colocated…
Author
gao-yan
Browse Repository
No Audits
0d14f1ed8915 Fix: pengine: cl#5130 - Choose nodes capable of running all the colocated…
Author
gao-yan
Browse Repository
No Audits

Changes (37)

Path

Size

crmd/

include/

crm/

msg_xml.h

pengine/

status.h

lib/

pengine/

pengine/

test10/

colocated-utilization-clone.dot

colocated-utilization-clone.exp

colocated-utilization-clone.scores

colocated-utilization-clone.summary

colocated-utilization-clone.xml

	colocated-utilization-group.dot
	location-sets-templates.dot

	colocated-utilization-group.exp
	template-order-3.exp

	colocated-utilization-group.scores
	rec-node-2.scores

	colocated-utilization-group.summary
	location-sets-templates.summary

colocated-utilization-group.xml

	colocated-utilization-primitive-1.dot
	template-3.dot

	colocated-utilization-primitive-1.exp
	template-3.exp

	colocated-utilization-primitive-1.scores
	quorum-1.scores

	colocated-utilization-primitive-1.summary
	template-3.summary

colocated-utilization-primitive-1.xml

	colocated-utilization-primitive-2.dot
	template-rsc-sets-4.dot

	colocated-utilization-primitive-2.exp
	template-coloc-1.exp

	colocated-utilization-primitive-2.scores
	quorum-1.scores

	colocated-utilization-primitive-2.summary
	template-ticket.summary

colocated-utilization-primitive-2.xml

rP8ae45302394b

View Options

.travis.yml

View Options

GNUmakefile

View Options

Makefile.am

View Options

crmd/te_events.c

View Options

include/crm/msg_xml.h

View Options

include/crm/pengine/status.h

View Options

lib/pengine/utils.c

View Options

pacemaker.spec.in

View Options

pengine/Makefile.am

View Options

pengine/allocate.c

View Options

pengine/graph.c

View Options

pengine/native.c

View Options

pengine/regression.sh

View Options

pengine/test10/colocated-utilization-clone.dot

View Options

pengine/test10/colocated-utilization-clone.exp

View Options

pengine/test10/colocated-utilization-clone.scores

View Options

pengine/test10/colocated-utilization-clone.summary

View Options

pengine/test10/colocated-utilization-clone.xml

View Options

pengine/test10/colocated-utilization-group.dot

View Options

pengine/test10/colocated-utilization-group.exp

View Options

pengine/test10/colocated-utilization-group.scores

View Options

pengine/test10/colocated-utilization-group.summary

View Options

pengine/test10/colocated-utilization-group.xml

View Options

pengine/test10/colocated-utilization-primitive-1.dot

View Options

pengine/test10/colocated-utilization-primitive-1.exp

View Options

pengine/test10/colocated-utilization-primitive-1.scores

View Options

pengine/test10/colocated-utilization-primitive-1.summary

View Options

pengine/test10/colocated-utilization-primitive-1.xml

View Options

pengine/test10/colocated-utilization-primitive-2.dot

View Options

pengine/test10/colocated-utilization-primitive-2.exp

View Options

pengine/test10/colocated-utilization-primitive-2.scores

View Options

pengine/test10/colocated-utilization-primitive-2.summary

View Options

pengine/test10/colocated-utilization-primitive-2.xml

View Options

pengine/utilization.c

View Options

pengine/utils.c

View Options

pengine/utils.h

View Options

Merge ../1.18ae45302394bActions

Description

Details

Event Timeline

Merged Changes

Changes (37)

rP8ae45302394b

.travis.yml

GNUmakefile

Makefile.am

crmd/te_events.c

include/crm/msg_xml.h

include/crm/pengine/status.h

lib/pengine/utils.c

pacemaker.spec.in

pengine/Makefile.am

pengine/allocate.c

pengine/graph.c

pengine/native.c

pengine/regression.sh

pengine/test10/colocated-utilization-clone.dot

pengine/test10/colocated-utilization-clone.exp

pengine/test10/colocated-utilization-clone.scores

pengine/test10/colocated-utilization-clone.summary

pengine/test10/colocated-utilization-clone.xml

pengine/test10/colocated-utilization-group.dot

pengine/test10/colocated-utilization-group.exp

pengine/test10/colocated-utilization-group.scores

pengine/test10/colocated-utilization-group.summary

pengine/test10/colocated-utilization-group.xml

pengine/test10/colocated-utilization-primitive-1.dot

pengine/test10/colocated-utilization-primitive-1.exp

pengine/test10/colocated-utilization-primitive-1.scores

pengine/test10/colocated-utilization-primitive-1.summary

pengine/test10/colocated-utilization-primitive-1.xml

pengine/test10/colocated-utilization-primitive-2.dot

pengine/test10/colocated-utilization-primitive-2.exp

pengine/test10/colocated-utilization-primitive-2.scores

pengine/test10/colocated-utilization-primitive-2.summary

pengine/test10/colocated-utilization-primitive-2.xml

pengine/utilization.c

pengine/utils.c

pengine/utils.h

rpmlintrc

Merge ../1.1
8ae45302394b
Actions