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

Description

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

Details

Provenance

Authored on Aug 11 2016, 8:07 PM

Parents

rP4a3e5ec21d1c: Merge pull request #1117 from krig/fping-fix-2
rP19d273ae5831: Fix: crmd: Resend the shutdown request if the DC forgets

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

4a3e5ec21d1c Merge pull request #1117 from krig/fping-fix-2
Author
kgaillot
Browse Repository
No Audits
a7373f920164 Low: ping: Avoid temp files in fping_check (bsc#987348)
Author
Kristoffer Grönlund <krig@koru.se>
Browse Repository
No Audits
89505e8d02d1 Merge pull request #1116 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
93b45f991df6 Log: various: spelling corrections
Author
kgaillot
Browse Repository
No Audits
b0c542d31a0a Refactor: crmd: rename node state function to be more clear
Author
kgaillot
Browse Repository
No Audits
29cbb5d01653 Fix: crmd: clear remote node operation history only when it comes up
Author
kgaillot
Browse Repository
No Audits
9a3492005add Merge pull request #1115 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
02e303ea3ac4 Low: libcib,libfencing,libtransition: handle memory allocation errors without…
Author
kgaillot
Browse Repository
No Audits
2ba6773d0aea Low: pengine: use new "remote node" vs "guest node" terminology in allocate.c
Author
kgaillot
Browse Repository
No Audits
f854f358351a Low: crmd,pengine,libcluster: spelling corrections
Author
kgaillot
Browse Repository
No Audits
3d75ded9beee Merge pull request #1114 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
e8d324a69071 Low: tools: make crm_mon XML schema handle resources with multiple active
Author
kgaillot
Browse Repository
No Audits
5dff1065e381 Merge pull request #1112 from igor-tsiglyar/versioned-migration
Author
kgaillot
Browse Repository
No Audits
0bec2aecd7e8 Test: pengine: disable live migration for versioned resources
Author
Igor Tsiglyar <igor_tsiglyar@outlook.com>
Browse Repository
No Audits
eae8aee3d6f7 Fix: pengine: disable migration for versioned resources
Author
Igor Tsiglyar <igor_tsiglyar@outlook.com>
Browse Repository
No Audits
551f89836b93 Merge pull request #1111 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
11cbc8c2839f Low: tools: make crm_mon resources section more consistent
Author
kgaillot
Browse Repository
No Audits
71d1326bd63b Merge pull request #1109 from wenningerk/lsb_init
Author
kgaillot
Browse Repository
No Audits
e8f8410efc06 LSB init: start/stop SBD with pacemaker
Author
wenningerk
Browse Repository
No Audits
fe50b4234ece Low: LSB init: try to be a little more compliant
Author
wenningerk
Browse Repository
No Audits

Changes (34)

Path

Size

crmd/

cts/

extra/

resources/

ping

fencing/

fence_dummy

include/

crm/

pengine/

status.h

lib/

cib/

cluster/

fencing/

pengine/

transition/

lrmd/

mcp/

pengine/

test10/

	migrate-versioned.dot
	coloc_fp_logic.dot

migrate-versioned.exp

migrate-versioned.scores

	migrate-versioned.summary
	coloc_fp_logic.summary

migrate-versioned.xml

tools/

crm_mon.c

crm_resource_runtime.c

xml/

crm_mon.rng

rPa73276195df2

View Options

crmd/callbacks.c

View Options

crmd/crmd_utils.h

View Options

crmd/election.c

View Options

crmd/heartbeat.c

View Options

crmd/lrm.c

View Options

crmd/membership.c

View Options

crmd/remote_lrmd_ra.c

View Options

crmd/te_actions.c

View Options

crmd/te_callbacks.c

View Options

cts/CTStests.py

View Options

extra/resources/ping

View Options

fencing/fence_dummy

View Options

include/crm/pengine/status.h

View Options

lib/cib/cib_attrs.c

View Options

lib/cib/cib_utils.c

View Options

lib/cluster/election.c

View Options

lib/fencing/st_client.c

View Options

lib/pengine/complex.c

View Options

lib/pengine/status.c

View Options

lib/transition/unpack.c

View Options

lrmd/pacemaker_remote.in

View Options

mcp/pacemaker.in

View Options

pengine/allocate.c

View Options

pengine/constraints.c

View Options

pengine/notif.c

View Options

pengine/regression.sh

View Options

pengine/test10/migrate-versioned.dot

View Options

pengine/test10/migrate-versioned.exp

View Options

pengine/test10/migrate-versioned.scores

View Options

pengine/test10/migrate-versioned.summary

View Options

pengine/test10/migrate-versioned.xml

View Options

tools/crm_mon.c

View Options

tools/crm_resource_runtime.c

View Options

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

Description

Details

Event Timeline

Merged Changes

Changes (34)

rPa73276195df2

crmd/callbacks.c

crmd/crmd_utils.h

crmd/election.c

crmd/heartbeat.c

crmd/lrm.c

crmd/membership.c

crmd/remote_lrmd_ra.c

crmd/te_actions.c

crmd/te_callbacks.c

cts/CTStests.py

extra/resources/ping

fencing/fence_dummy

include/crm/pengine/status.h

lib/cib/cib_attrs.c

lib/cib/cib_utils.c

lib/cluster/election.c

lib/fencing/st_client.c

lib/pengine/complex.c

lib/pengine/status.c

lib/transition/unpack.c

lrmd/pacemaker_remote.in

mcp/pacemaker.in

pengine/allocate.c

pengine/constraints.c

pengine/notif.c

pengine/regression.sh

pengine/test10/migrate-versioned.dot

pengine/test10/migrate-versioned.exp

pengine/test10/migrate-versioned.scores

pengine/test10/migrate-versioned.summary

pengine/test10/migrate-versioned.xml

tools/crm_mon.c

tools/crm_resource_runtime.c

xml/crm_mon.rng

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