Diffusion Pacemaker 46bc724fa621

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

Description

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

Conflicts:
include/crm/common/ipcs.h
lib/common/ipc.c

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Oct 14 2013, 6:53 PM

Parents

rP6a5e863b835f: Merge pull request #373 from davidvossel/remote-node-ipc-proxy-fixes
rPaa024490a023: Feature: remote: Properly version the remote connection protocol

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

6a5e863b835f Merge pull request #373 from davidvossel/remote-node-ipc-proxy-fixes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5c21a6b6e778 Low: crmd: Pad internal lrmd rsc_info and metadata retrieval timeout
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
d65b2703d210 Low: crmd: Cache rsc_info retrieved from lrmd and pacemaker_remoted
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
d2cba82ef4a1 Low: crmd: Using PCMK_ipc_buffer variable for remote-node proxy
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
46f4f7efef02 Merge pull request #371 from davidvossel/remote-node-ipc-proxy-fixes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
714cbedbe034 Merge pull request #370 from davidvossel/ipc_buf_size_detection
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
fa044fd4154d High: ipc: Compress msgs based on client's actual max send size
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9db3d422ea08 Low: ipc: detect new libqb api function for retrieving server client connection…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
809f3246b397 Merge pull request #368 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
405dc17bdb96 Low: pengine: Update regression tests to reflect not probing connection resoures
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
4acb4303a67b Low: pengine: Do not probe for connection resources
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
0cb14dba5160 Merge pull request #367 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
63097f454bbc Low: cts: Increase lxc ram size to 196mb and mount dedicated /dev/shm using…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
728ec7785154 Merge pull request #362 from gao-yan/services-action-sync
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8fb19ec27b0c Merge pull request #366 from davidvossel/lxc_logging
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
cdbd8e38b259 Low: cts: Store lxc log files in /var/log/pacemaker_remote_lxc*.log
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
eca24223ab5b Merge pull request #365 from davidvossel/fencing_regression_test_update
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b3cfb293ea85 Low: fencing: Regression test for fence after all topology entries are removed
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
57de742c237a Fix: fencing: Allow fencing for node after topology entries are deleted
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
644298e26192 Low: fencing: Update regression test-suite to use fence_dummy
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
78faba927143 Low: fencing: Update fencing test to use fence_dummy agent
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
fd5d4e2f3b61 Low: fencing: Do not broadcast suicide if the on action is being executed
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
96cf692aa1d0 Merge pull request #364 from davidvossel/container_probes_option
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
ade4e367749e Test: Make sure that fence_dummy has executable bit set
Author
chrissie-c
Browse Repository
No Audits
3d1417f0265e Low: fencing: Update return codes for regression tests
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
acf50bf80143 Low: pengine: Disable container probes regression test
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7bd181347537 Feature: remote: Option to enable/disable probes on container resource remote…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
516138602a72 Merge pull request #363 from gao-yan/service-monitor-cancel
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
1c14b9d69470 Fix: lrmd: Correctly cancel monitor actions for lsb/systemd/service resources…
Author
gao-yan
Browse Repository
No Audits
11473a5a8c88 Fix: services: Fix the executing of synchronous actions
Author
gao-yan
Browse Repository
No Audits

Changes (35)

Path

Size

cib/

crmd/

cts/

fencing/

include/

crm/

common/

ipcs.h

pengine/

status.h

lib/

common/

lrmd/

pengine/

services/

lrmd/

pengine/

test10/

remote-startup.summary

whitebox-disable-probes.dot

whitebox-disable-probes.exp

	whitebox-disable-probes.scores
	whitebox-start.scores

	whitebox-disable-probes.summary
	whitebox-start.summary

	whitebox-disable-probes.xml
	whitebox-start.xml

whitebox-fail3.dot

whitebox-fail3.exp

whitebox-fail3.summary

whitebox-ms-ordering.dot

whitebox-ms-ordering.exp

whitebox-ms-ordering.summary

rP46bc724fa621

View Options

cib/notify.c

View Options

configure.ac

View Options

crmd/crmd_lrm.h

View Options

crmd/lrm_state.c

View Options

cts/lxc_autogen.sh.in

View Options

fencing/commands.c

View Options

fencing/fence_dummy

View Options

fencing/regression.py.in

View Options

fencing/remote.c

View Options

fencing/test.c

View Options

include/crm/common/ipcs.h

View Options

include/crm/pengine/status.h

View Options

lib/common/ipc.c

View Options

lib/lrmd/lrmd_client.c

View Options

lib/pengine/common.c

View Options

lib/pengine/unpack.c

View Options

lib/services/services.c

View Options

lrmd/lrmd.c

View Options

pengine/allocate.c

View Options

pengine/native.c

View Options

pengine/regression.sh

View Options

pengine/test10/remote-startup.dot

View Options

pengine/test10/remote-startup.exp

View Options

pengine/test10/remote-startup.summary

View Options

pengine/test10/whitebox-disable-probes.dot

View Options

pengine/test10/whitebox-disable-probes.exp

View Options

pengine/test10/whitebox-disable-probes.scores

View Options

pengine/test10/whitebox-disable-probes.summary

View Options

pengine/test10/whitebox-disable-probes.xml

View Options

pengine/test10/whitebox-fail3.dot

View Options

pengine/test10/whitebox-fail3.exp

View Options

pengine/test10/whitebox-fail3.summary

View Options

pengine/test10/whitebox-ms-ordering.dot

View Options

pengine/test10/whitebox-ms-ordering.exp

View Options

pengine/test10/whitebox-ms-ordering.summary

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

Description

Details

Event Timeline

Merged Changes

Changes (35)

rP46bc724fa621

cib/notify.c

configure.ac

crmd/crmd_lrm.h

crmd/lrm_state.c

cts/lxc_autogen.sh.in

fencing/commands.c

fencing/fence_dummy

fencing/regression.py.in

fencing/remote.c

fencing/test.c

include/crm/common/ipcs.h

include/crm/pengine/status.h

lib/common/ipc.c

lib/lrmd/lrmd_client.c

lib/pengine/common.c

lib/pengine/unpack.c

lib/services/services.c

lrmd/lrmd.c

pengine/allocate.c

pengine/native.c

pengine/regression.sh

pengine/test10/remote-startup.dot

pengine/test10/remote-startup.exp

pengine/test10/remote-startup.summary

pengine/test10/whitebox-disable-probes.dot

pengine/test10/whitebox-disable-probes.exp

pengine/test10/whitebox-disable-probes.scores

pengine/test10/whitebox-disable-probes.summary

pengine/test10/whitebox-disable-probes.xml

pengine/test10/whitebox-fail3.dot

pengine/test10/whitebox-fail3.exp

pengine/test10/whitebox-fail3.summary

pengine/test10/whitebox-ms-ordering.dot

pengine/test10/whitebox-ms-ordering.exp

pengine/test10/whitebox-ms-ordering.summary

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