Diffusion Pacemaker 34868df6f077

Merge branch 'master' of github.com:ClusterLabs/pacemaker
34868df6f077
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 Jun 5 2012, 1:01 AM

Parents

rP918608c11371: Merge pull request #71 from davidvossel/bug-5054
rPbdc5bf0a608b: Merge branch 'build-fixes' of git://github.com/lge/pacemaker

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

918608c11371 Merge pull request #71 from davidvossel/bug-5054
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5f61de6a363a Merge pull request #78 from davidvossel/mainloop_fd_race_condition
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
57b7f49623f9 Merge pull request #74 from gao-yan/ra-fixing
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
3d48d45b5671 Merge pull request #79 from gao-yan/proc-flag
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
711b0a4198c6 Merge pull request #80 from fghaas/pkgconfig
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
010a16b1c8b2 pkg-config: correct includedir
Author
Florian Haas <florian@hastexo.com>
Browse Repository
No Audits
b79a73e663d0 pkg-config: linker flag should be -lpe_status, not -lpe_state
Author
Florian Haas <florian@hastexo.com>
Browse Repository
No Audits
5b948c9c25a4 Low: RA: ClusterMon - A minor tweak
Author
gao-yan
Browse Repository
No Audits
3e12eebb6cb2 High: Core: Revert to the original process flags for the support of rolling…
Author
gao-yan
Browse Repository
No Audits
837653d0431b High: core: Fixes race condition in mainloop add/delete fd wrapper functions.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
429c417f450a Medium: RA: ClusterMon - Don't fail in stop if the process is missing…
Author
Dejan Muhamedagic <dejan@suse.de>
Browse Repository
No Audits
6cf0342fb6eb Low: pengine: cl#5054 - Regression tests for demote before stop action for rsc…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9f1ec72a8269 Medium: pengine: cl#5054 - Ensure demote occurs before stop of multistate…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (26)

Path

Size

extra/

resources/

include/

crm/

pengine/

lib/

common/

pengine/

test10/

colocation_constraint_stops_master.dot

colocation_constraint_stops_master.exp

colocation_constraint_stops_master.scores

colocation_constraint_stops_master.xml

colocation_constraint_stops_slave.dot

colocation_constraint_stops_slave.exp

colocation_constraint_stops_slave.scores

colocation_constraint_stops_slave.xml

order_constraint_stops_master.dot

order_constraint_stops_master.exp

order_constraint_stops_master.scores

order_constraint_stops_master.xml

order_constraint_stops_slave.dot

order_constraint_stops_slave.exp

order_constraint_stops_slave.scores

order_constraint_stops_slave.xml

rP34868df6f077

extra/resources/ClusterMon

Loading...

include/crm/ais.h

Loading...

include/crm/pengine/status.h

Loading...

lib/common/mainloop.c

Loading...

lib/pcmk-cib.pc.in

Loading...

lib/pcmk-pe.pc.in

Loading...

lib/pcmk.pc.in

Loading...

pengine/graph.c

Loading...

pengine/native.c

Loading...

pengine/regression.sh

Loading...

pengine/test10/colocation_constraint_stops_master.dot

Loading...

pengine/test10/colocation_constraint_stops_master.exp

Loading...

pengine/test10/colocation_constraint_stops_master.scores

Loading...

pengine/test10/colocation_constraint_stops_master.xml

Loading...

pengine/test10/colocation_constraint_stops_slave.dot

Loading...

pengine/test10/colocation_constraint_stops_slave.exp

Loading...

pengine/test10/colocation_constraint_stops_slave.scores

Loading...

pengine/test10/colocation_constraint_stops_slave.xml

Loading...

pengine/test10/order_constraint_stops_master.dot

Loading...

pengine/test10/order_constraint_stops_master.exp

Loading...

pengine/test10/order_constraint_stops_master.scores

Loading...

pengine/test10/order_constraint_stops_master.xml

Loading...

pengine/test10/order_constraint_stops_slave.dot

Loading...

pengine/test10/order_constraint_stops_slave.exp

Loading...

pengine/test10/order_constraint_stops_slave.scores

Loading...

pengine/test10/order_constraint_stops_slave.xml

Loading...