Diffusion Pacemaker cd90d1600f96

Merge branch 'master' of github.com:ClusterLabs/pacemaker
cd90d1600f96
Actions

Description

Merge branch 'master' of github.com:ClusterLabs/pacemaker

Conflicts:
lib/fencing/st_client.c

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Feb 27 2014, 4:27 PM

Parents

rPb1dc2808e135: Merge pull request #442 from gao-yan/cibadmin-replace-reply
rPfc8716fa12eb: Feature: Fencing: Add the ability to call stonith_api_time() from stonith_admin

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

b1dc2808e135 Merge pull request #442 from gao-yan/cibadmin-replace-reply
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
826a6c229c62 Merge pull request #444 from davidvossel/stonith_histroy_fix
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
054fedfe7086 Fix: stonith_api_time_helper now returns when the most recent fencing operation…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
549ea3d73509 Merge pull request #441 from chrissie-c/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b4b50d73acaa crm_mon: add brackets around conditionals and remove tabs
Author
chrissie-c
Browse Repository
No Audits
2be984a9fcdb Fix: cib: Ensure 'cibadmin -R/--replace' commands get replies
Author
gao-yan
Browse Repository
No Audits
94b286b8ae6e Merge pull request #440 from gao-yan/install-compatibility.h
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e09637e78e0f crm_mon: Add -R switch to show clone details
Author
chrissie-c
Browse Repository
No Audits
4945dcf7c735 Build: Install compatibility.h
Author
gao-yan
Browse Repository
No Audits
5823369208a6 Doc: pcs-crmsh-quick-ref: Fix resource stop/start on pcs
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
fa7df0856dfc Doc: Update crmsh/pcs quickref
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0b7d85a159cc Merge pull request #437 from gao-yan/anti-colocation-order
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
fce6b9ebba34 Merge pull request #435 from davidvossel/controld_fixes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
0f6773fdfc6d Merge pull request #439 from gao-yan/rsc-maintenance-mode
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
84c45113eadf Fix: controld: Do not consider the dlm up until the address list is present
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
884585015032 Test: pengine: Support per-resource maintenance mode
Author
gao-yan
Browse Repository
No Audits
9a8cb865732f Feature: pengine: Support per-resource maintenance mode
Author
gao-yan
Browse Repository
No Audits
0d3f74a5caa7 Merge pull request #438 from inouekazu/attrd_log_level
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
eeaa7131a214 attrd: Change the threshold of log level to LOG_INFO
Author
inouekazu
Browse Repository
No Audits
cbd84e711c1e Test: pengine: cl#5187 - Prevent resources in an anti-colocation from even…
Author
gao-yan
Browse Repository
No Audits
e83c08c28f15 Test: pengine: cl#5187 - Prevent resources in an anti-colocation from even…
Author
gao-yan
Browse Repository
No Audits
9f9ed87e01bf Fix: pengine: cl#5187 - Prevent resources in an anti-colocation from even…
Author
gao-yan
Browse Repository
No Audits
11160a94b76a High: controld: handling startup fencing within the controld agent, not the dlm
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (32)

Path

Size

attrd/

main.c

cib/

callbacks.c

doc/

pcs-crmsh-quick-ref.md

extra/

resources/

controld

include/

crm/

pengine/

lib/

fencing/

pengine/

pengine/

test10/

anti-colocation-order.dot

	anti-colocation-order.exp
	rsc-sets-seq-false.exp

	anti-colocation-order.scores
	group-fail.scores

anti-colocation-order.summary

anti-colocation-order.xml

bug-lf-2435.dot

bug-lf-2435.exp

	rsc-maintenance.dot
	stopped-monitor-25.dot

	rsc-maintenance.exp
	stopped-monitor-25.exp

rsc-maintenance.scores

rsc-maintenance.summary

tools/

rPcd90d1600f96

View Options

attrd/main.c

View Options

cib/callbacks.c

View Options

doc/pcs-crmsh-quick-ref.md

View Options

extra/resources/controld

View Options

include/crm/Makefile.am

View Options

include/crm/msg_xml.h

View Options

include/crm/pengine/common.h

View Options

include/crm/pengine/status.h

View Options

lib/fencing/st_client.c

View Options

lib/pengine/clone.c

View Options

lib/pengine/complex.c

View Options

pengine/allocate.c

View Options

pengine/constraints.c

View Options

pengine/graph.c

View Options

pengine/native.c

View Options

pengine/regression.sh

View Options

pengine/test10/anti-colocation-order.dot

View Options

pengine/test10/anti-colocation-order.exp

View Options

pengine/test10/anti-colocation-order.scores

View Options

pengine/test10/anti-colocation-order.summary

View Options

pengine/test10/anti-colocation-order.xml

View Options

pengine/test10/bug-lf-2435.dot

View Options

pengine/test10/bug-lf-2435.exp

View Options

pengine/test10/rsc-maintenance.dot

View Options

pengine/test10/rsc-maintenance.exp

View Options

pengine/test10/rsc-maintenance.scores

View Options

pengine/test10/rsc-maintenance.summary

View Options

pengine/test10/rsc-maintenance.xml

View Options

pengine/test10/simple6.dot

View Options

pengine/test10/simple6.exp

View Options

pengine/test10/simple6.summary

View Options

Merge branch 'master' of github.com:ClusterLabs/pacemakercd90d1600f96Actions

Description

Details

Event Timeline

Merged Changes

Changes (32)

rPcd90d1600f96

attrd/main.c

cib/callbacks.c

doc/pcs-crmsh-quick-ref.md

extra/resources/controld

include/crm/Makefile.am

include/crm/msg_xml.h

include/crm/pengine/common.h

include/crm/pengine/status.h

lib/fencing/st_client.c

lib/pengine/clone.c

lib/pengine/complex.c

pengine/allocate.c

pengine/constraints.c

pengine/graph.c

pengine/native.c

pengine/regression.sh

pengine/test10/anti-colocation-order.dot

pengine/test10/anti-colocation-order.exp

pengine/test10/anti-colocation-order.scores

pengine/test10/anti-colocation-order.summary

pengine/test10/anti-colocation-order.xml

pengine/test10/bug-lf-2435.dot

pengine/test10/bug-lf-2435.exp

pengine/test10/rsc-maintenance.dot

pengine/test10/rsc-maintenance.exp

pengine/test10/rsc-maintenance.scores

pengine/test10/rsc-maintenance.summary

pengine/test10/rsc-maintenance.xml

pengine/test10/simple6.dot

pengine/test10/simple6.exp

pengine/test10/simple6.summary

tools/crm_mon.c

Merge branch 'master' of github.com:ClusterLabs/pacemaker
cd90d1600f96
Actions