Diffusion Pacemaker b5a04ac01551

Merge branch 'master' of github.com:ClusterLabs/pacemaker
b5a04ac01551
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 Feb 8 2013, 1:24 AM

Parents

rP60cbcf90b9fb: Merge pull request #224 from gao-yan/process-ticket-constraints
rPa9308f899529: Refactor: Core: Switch to a 'double' memory re-allocation stratgey for xml…

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

60cbcf90b9fb Merge pull request #224 from gao-yan/process-ticket-constraints
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7a00ccebbe47 Merge pull request #226 from davidvossel/status_deletion
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
23f2032ddb06 Low: pengine: Update regression tests for deletion of orphan resources
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
57a53082c512 High: pengine: rhbz#902459 - Remove rsc node status for orphan resources
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
8923e44550db Low: pengine: Update to pengine regression tests for refresh change
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a6fab859b3ee High: pengine: Refresh after delete action is no long required.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e003c7b2d993 Merge pull request #223 from JamesGuthrie/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
650c5f9d5b3c Low: pengine: Process rsc_ticket dependencies earlier for correctly allocating…
Author
gao-yan
Browse Repository
No Audits
6c2ad0d7fafe High: pengine: Process rsc_ticket dependencies earlier for correctly allocating…
Author
gao-yan
Browse Repository
No Audits
8ad9d3759f72 Doc: Pacemaker_Explained: Changed /etc/ais/authkey to /etc/corosync/authkey
Author
James Guthrie <james@prodigi.ch>
Browse Repository
No Audits
663ce4905cd8 Merge pull request #222 from inouekazu/set_env_variables
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2504eac1653d Low: mcp: set environment variables which the cluster-glue module needs.
Author
inouekazu
Browse Repository
No Audits
1b7859d0f926 Merge pull request #217 from davidvossel/failcount_cleanup
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
2ddc092db289 Low: pengine: Update pengine regression test for new failure cleanup change
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
d579c3066101 Low: pengine: Regression tests to verify failcount is cleared for start…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
10a93cdc4d6f High: pengine: cl#5025 - Automatically clear failcount for start/monitor…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
90977a399e32 Low: pengine: Refactor op digest calculation and comparison
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
39a93564a35a Merge pull request #221 from gao-yan/nagios
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6950562e1169 High: lrmd: Support nagios remote monitoring
Author
gao-yan
Browse Repository
No Audits
5f2e94a9ad64 Merge pull request #220 from davidvossel/remote_ra_doc
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
0dd98e23b49b Low: lrmd: Remote lrmd resource agent script
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f7b0a01632c9 Merge pull request #195 from gao-yan/container
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b13255310c71 Low: ipc: Fixes ipc compression assert to assert the correct value
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
73d33bbfa014 Merge pull request #211 from gao-yan/fencing-registration
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
bd8a08e7c18e Medium: fencing: Properly calculate fencing operation timeout value in…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9c5ef7e9c864 Medium: fencing: Don't start fencing op until a promising query result has…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
6149c2ce571c Low: lrmd: Automatically create authkey for lrmd regression tests when no…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
c310e2591652 Merge pull request #219 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
577e4e8fb000 Low: core: Fix compile errors when gnutls-devel is not installed
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7e866d5e553e Merge pull request #218 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
8fb2c2f1a409 Merge pull request #216 from gao-yan/acl-compilation
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7b3dd850cd0c High: ACL: Fix compilation when "--with-acl" is enabled
Author
gao-yan
Browse Repository
No Audits
903323754b88 High: fencing: Correctly register devices from CIB for Linux-HA fencing agents…
Author
gao-yan
Browse Repository
No Audits
ab98f5ab97c1 Low: PE: Support for resource container (regression tests)
Author
gao-yan
Browse Repository
No Audits
0a37f43a0abe High: PE: Support for resource container
Author
gao-yan
Browse Repository
No Audits

Changes (150)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

cib/

crmd/

remote_lrmd_ra.c

doc/

Pacemaker_Explained/

en-US/

it-IT/

ro-RO/

extra/

resources/

fencing/

include/

crm/

pengine/

lib/

cib/

common/

fencing/

lrmd/

pengine/

services/

services_linux.c

services_private.h

lrmd/

regression.py.in

mcp/

pengine/

test10/

bug-1718.summary

bug-5025-4.scores

bug-5025-4.summary

bug-5059.summary

bug-lf-2361.dot

bug-lf-2361.exp

bug-lf-2361.summary

bug-lf-2493.dot

bug-lf-2493.exp

bug-lf-2493.summary

clone-anon-dup.dot

clone-anon-dup.exp

clone-anon-dup.summary

clone-max-zero.dot

clone-max-zero.exp

clone-max-zero.summary

cloned-group.dot

cloned-group.exp

cloned-group.summary

coloc-intra-set.dot

coloc-intra-set.exp

coloc-intra-set.summary

container-1.dot

container-1.exp

container-1.scores

container-1.summary

container-1.xml

container-2.dot

container-2.exp

container-2.scores

container-2.summary

container-2.xml

container-3.dot

container-3.exp

container-3.scores

container-3.summary

container-3.xml

container-4.dot

container-4.exp

container-4.scores

container-4.summary

container-4.xml

container-group-1.dot

container-group-1.exp

container-group-1.scores

container-group-1.summary

container-group-1.xml

container-group-2.dot

container-group-2.exp

container-group-2.scores

container-group-2.summary

container-group-2.xml

container-group-3.dot

container-group-3.exp

container-group-3.scores

container-group-3.summary

container-group-3.xml

container-group-4.dot

container-group-4.exp

container-group-4.scores

container-group-4.summary

container-group-4.xml

failcount.summary

obsolete-lrm-resource.dot

obsolete-lrm-resource.exp

obsolete-lrm-resource.summary

orphan-1.summary

orphan-2.summary

params-2.summary

ticket-clone-12.scores

ticket-clone-21.dot

ticket-clone-21.exp

ticket-clone-21.summary

ticket-clone-24.scores

ticket-clone-9.dot

ticket-clone-9.exp

ticket-clone-9.summary

ticket-master-12.scores

ticket-master-21.dot

ticket-master-21.exp

ticket-master-21.summary

ticket-master-24.scores

ticket-master-9.dot

ticket-master-9.exp

ticket-master-9.summary

tools/

xml/

resources-1.1.rng

rPb5a04ac01551

cib/callbacks.c

cib/notify.c

cib/remote.c

configure.ac

crmd/control.c

crmd/crmd_lrm.h

crmd/lrm_state.c

crmd/remote_lrmd_ra.c

doc/Pacemaker_Explained/en-US/Ch-Nodes.txt

doc/Pacemaker_Explained/it-IT/Ch-Nodes.po

doc/Pacemaker_Explained/ro-RO/Ch-Nodes.po

extra/resources/Makefile.am

extra/resources/remote

fencing/remote.c

include/crm/msg_xml.h

include/crm/pengine/common.h

include/crm/pengine/internal.h

include/crm/pengine/status.h

include/crm/services.h

lib/cib/cib_remote.c

lib/common/ipc.c

lib/fencing/st_client.c

lib/lrmd/lrmd_client.c

lib/pengine/common.c

lib/pengine/status.c

lib/pengine/unpack.c

lib/pengine/utils.c

lib/services/services.c

lib/services/services_linux.c

lib/services/services_private.h

lrmd/lrmd.c

lrmd/regression.py.in

mcp/pacemaker.c

pengine/allocate.c

pengine/clone.c

pengine/constraints.c

pengine/group.c

pengine/native.c

pengine/regression.sh

pengine/test10/797.dot

pengine/test10/797.exp

pengine/test10/797.summary

pengine/test10/bug-1718.dot

pengine/test10/bug-1718.exp

pengine/test10/bug-1718.summary

pengine/test10/bug-5025-4.dot

pengine/test10/bug-5025-4.exp

pengine/test10/bug-5025-4.scores

pengine/test10/bug-5025-4.summary

pengine/test10/bug-5025-4.xml

pengine/test10/bug-5059.dot

pengine/test10/bug-5059.exp

pengine/test10/bug-5059.summary

pengine/test10/bug-lf-2361.dot

pengine/test10/bug-lf-2361.exp

pengine/test10/bug-lf-2361.summary

pengine/test10/bug-lf-2493.dot

pengine/test10/bug-lf-2493.exp

pengine/test10/bug-lf-2493.summary

pengine/test10/clone-anon-dup.dot

pengine/test10/clone-anon-dup.exp

pengine/test10/clone-anon-dup.summary

pengine/test10/clone-max-zero.dot

pengine/test10/clone-max-zero.exp

pengine/test10/clone-max-zero.summary

pengine/test10/cloned-group.dot

pengine/test10/cloned-group.exp

pengine/test10/cloned-group.summary

pengine/test10/coloc-intra-set.dot

pengine/test10/coloc-intra-set.exp

pengine/test10/coloc-intra-set.summary

pengine/test10/container-1.dot

pengine/test10/container-1.exp

pengine/test10/container-1.scores

pengine/test10/container-1.summary

pengine/test10/container-1.xml

pengine/test10/container-2.dot

pengine/test10/container-2.exp

pengine/test10/container-2.scores

pengine/test10/container-2.summary

pengine/test10/container-2.xml

pengine/test10/container-3.dot

pengine/test10/container-3.exp

pengine/test10/container-3.scores

pengine/test10/container-3.summary

pengine/test10/container-3.xml

pengine/test10/container-4.dot

pengine/test10/container-4.exp

pengine/test10/container-4.scores

pengine/test10/container-4.summary

pengine/test10/container-4.xml

pengine/test10/container-group-1.dot

pengine/test10/container-group-1.exp

pengine/test10/container-group-1.scores

pengine/test10/container-group-1.summary

pengine/test10/container-group-1.xml

pengine/test10/container-group-2.dot

pengine/test10/container-group-2.exp

pengine/test10/container-group-2.scores

pengine/test10/container-group-2.summary

pengine/test10/container-group-2.xml

pengine/test10/container-group-3.dot

pengine/test10/container-group-3.exp

pengine/test10/container-group-3.scores

pengine/test10/container-group-3.summary

pengine/test10/container-group-3.xml

pengine/test10/container-group-4.dot

pengine/test10/container-group-4.exp

pengine/test10/container-group-4.scores

pengine/test10/container-group-4.summary

pengine/test10/container-group-4.xml

pengine/test10/failcount.dot

pengine/test10/failcount.exp

pengine/test10/failcount.summary

pengine/test10/failcount.xml

pengine/test10/inc9.dot

pengine/test10/inc9.exp

pengine/test10/inc9.summary

pengine/test10/obsolete-lrm-resource.dot

pengine/test10/obsolete-lrm-resource.exp

pengine/test10/obsolete-lrm-resource.summary

pengine/test10/orphan-0.exp

pengine/test10/orphan-1.dot

pengine/test10/orphan-1.exp

pengine/test10/orphan-1.summary

pengine/test10/orphan-2.dot

pengine/test10/orphan-2.exp

pengine/test10/orphan-2.summary

pengine/test10/params-2.dot

pengine/test10/params-2.exp

pengine/test10/params-2.summary

pengine/test10/ticket-clone-12.scores

pengine/test10/ticket-clone-21.dot

pengine/test10/ticket-clone-21.exp

pengine/test10/ticket-clone-21.summary

pengine/test10/ticket-clone-24.scores

pengine/test10/ticket-clone-9.dot

pengine/test10/ticket-clone-9.exp

pengine/test10/ticket-clone-9.summary

pengine/test10/ticket-master-12.scores

pengine/test10/ticket-master-21.dot

pengine/test10/ticket-master-21.exp

pengine/test10/ticket-master-21.summary

pengine/test10/ticket-master-24.scores

pengine/test10/ticket-master-9.dot

pengine/test10/ticket-master-9.exp

pengine/test10/ticket-master-9.summary

tools/attrd.c

tools/crm_simulate.c

xml/resources-1.1.rng