Diffusion Pacemaker 3073c2b19e03

Merge pull request #703 from ClusterLabs/1.1
3073c2b19e03
Actions

Description

Merge pull request #703 from ClusterLabs/1.1

merge 1.1 back into master

Details

Provenance

David Vossel <dvossel@redhat.com>

Authored on May 8 2015, 1:02 PM

Parents

rP091802e0ce31: Merge pull request #701 from gao-yan/rolling-upgrade-fence
rPd262b214faf1: Merge pull request #688 from digimer/master

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

091802e0ce31 Merge pull request #701 from gao-yan/rolling-upgrade-fence
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b47d6e7f2191 Merge pull request #694 from kgaillot/bz1200849
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
be27fc8b87c6 Merge pull request #685 from kgaillot/fixes-1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ac6c932a86b2 Merge pull request #700 from gao-yan/acl-xsl
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c34ec9feb438 Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
06b00d5bf0c4 Build: Attempt to fix travis builds
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4e1438384f64 Fix: crmd: Prevent the old version of DC from being fenced when it shuts down…
Author
gao-yan
Browse Repository
No Audits
11b6be889460 Fix: xml: Fix upgrade-1.3.xsl to correctly transform ACL rules with "attribute"
Author
gao-yan
Browse Repository
No Audits
f47ea56b4ec2 Merge pull request #696 from davidvossel/pcmk-docker-bff
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5788752b7461 Merge pull request #695 from davidvossel/mainloop_poll_mod
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
195559d47b0e Merge pull request #697 from gao-yan/crm_mon-packaging
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a0702576c37a Merge pull request #687 from gao-yan/fence_legacy_nodename
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a3c85f60f069 Build: spec: Move the service and configuration files of crm_mon to cli package
Author
gao-yan
Browse Repository
No Audits
da5db2cec081 Fix: pengine: process rsc parameters during unpack
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
887bc7ffb5c2 Low: pengine: handle setting container attribute in the correct location
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9d969a9d6511 Low: revert pengine test changes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
557fba0ef1a7 Fix: fencing: Correctly make args for fencing agents
Author
gao-yan
Browse Repository
No Audits
649749340d77 Fix: fence_legacy: Avoid passing 'port' to cluster-glue agents
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
db2a65a22091 High: lrmd: move isolation wrappers to hidden directory
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
8c96179beec1 Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
daaacf298d26 Fix: corosync: Bug cl#5232 - Somewhat gracefully handle nodes with invalid UUIDs
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6811ddafd371 Doc: Work-around until pcs pulls in psmisc automatically
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0877ad876344 Fix: HealthSMART: OCF_RESKEY_drives could contain multiple values
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
199380dffd52 Merge pull request #686 from HideoYamauchi/1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0178380549fb Fix: mainloop: resolves race condition mainloop poll involving modification of…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
2c98d3706052 Fix: crmd/pengine: handle on-fail=ignore properly
Author
kgaillot
Browse Repository
No Audits
d0a7035d657c Refactor: crmd: get full action information earlier
Author
kgaillot
Browse Repository
No Audits
1efe282b9348 Refactor: crmd: rename action number variable in process_graph_event()
Author
kgaillot
Browse Repository
No Audits
77286458c14f Refactor: crmd: remove dead code
Author
kgaillot
Browse Repository
No Audits
055aa7fc8db5 Fix: crmd: respect start-failure-is-fatal even for artifically injected events
Author
kgaillot
Browse Repository
No Audits
ea70ac78c064 Fix: crmd: don't update fail count twice for same failure
Author
kgaillot
Browse Repository
No Audits
f4f14efb9035 Fix: crmd: report operation rc as advertised instead of status
Author
kgaillot
Browse Repository
No Audits
882c68f3f218 Refactor: crmd: use defined constant for magic "direct nack" RC
Author
kgaillot
Browse Repository
No Audits
e1f829449237 Merge pull request #692 from davidvossel/promote-restart-fix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9a98641b3938 Low: pengine: update regression tests to account for promote restart fix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9b0a3a6b0bad High: pengine: restart master instances on instance attribute changes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f46580f2a3b5 Merge pull request #691 from davidvossel/spec-fix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
ad1e463462a1 Merge pull request #690 from davidvossel/pid-kill-fix
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
e9f67626c6e3 Low: spec: move report.common and report.collector to cli package
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
91173c4f59ce High: services: Increment lib service's current version to indicate a new…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7a9eca4743ee High: common: Increment current and age for lib common as a result of APIs…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
546766129543 High: pengine: only kill process group on timeout when on-fail does not equal…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
34217384083b Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
382efe0f55e9 Fix: lrmd: Hint to child processes that using sd_notify is not required
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6ce0f0553d70 Agents: Fix the HealthSMART metadata
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
529deee04444 Merge pull request #689 from davidvossel/crm_resource_C
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
bc74de82760d Fix: make targetted reprobe for remote node work, crm_resource -C -N <remote…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
077cde20aeea Fix: crmd: include remote nodes when forcing cluster wide resource reprobe
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
7e609c196374 Low:Support of the start from systemd of crm_mon.(3)
Author
HideoYamauchi
Browse Repository
No Audits
51d894c5e3b5 Low:Support of the start from systemd of crm_mon.(2)
Author
HideoYamauchi
Browse Repository
No Audits

Changes (45)

Path

Size

crmd/

doc/

Clusters_from_Scratch/

en-US/

Ch-Installation.txt

extra/

resources/

HealthSMART

Makefile.am

fencing/

fence_legacy

include/

crm/

common/

mainloop.h

crm.h

services.h

lib/

cluster/

common/

fencing/

lrmd/

pengine/

services/

lrmd/

mcp/

pengine/

test10/

isolation-restart-all.xml

isolation-start-all.xml

tools/

xml/

rP3073c2b19e03

View Options

.travis.yml

View Options

configure.ac

View Options

crmd/callbacks.c

View Options

crmd/fsa_defines.h

View Options

crmd/lrm.c

View Options

crmd/te_callbacks.c

View Options

crmd/te_events.c

View Options

doc/Clusters_from_Scratch/en-US/Ch-Installation.txt

View Options

extra/resources/HealthSMART

View Options

extra/resources/Makefile.am

View Options

fencing/fence_legacy

View Options

include/crm/common/mainloop.h

View Options

include/crm/crm.h

View Options

include/crm/services.h

View Options

lib/cluster/cluster.c

View Options

lib/common/Makefile.am

View Options

lib/common/mainloop.c

View Options

lib/fencing/st_client.c

View Options

lib/lrmd/lrmd_client.c

View Options

lib/pengine/complex.c

View Options

lib/pengine/rules.c

View Options

lib/pengine/utils.c

View Options

lib/services/Makefile.am

View Options

lib/services/services.c

View Options

lib/services/services_linux.c

View Options

lrmd/lrmd.c

View Options

lrmd/lrmd_private.h

View Options

lrmd/main.c

View Options

mcp/pacemaker.service.in

View Options

pacemaker.spec.in

View Options

pengine/allocate.c

View Options

pengine/graph.c

View Options

pengine/native.c

View Options

pengine/test10/bug-1572-2.xml

View Options

pengine/test10/isolation-clone.xml

View Options

pengine/test10/isolation-restart-all.xml

View Options

pengine/test10/isolation-start-all.xml

View Options

pengine/test10/master-5.xml

View Options

pengine/test10/master-6.xml

View Options

tools/Makefile.am

View Options

tools/crm_mon.service.in

View Options

tools/crm_resource.c

View Options

xml/Makefile.am

View Options

xml/crm_mon.rng

View Options

Merge pull request #703 from ClusterLabs/1.13073c2b19e03Actions

Description

Details

Event Timeline

Merged Changes

Changes (45)

rP3073c2b19e03

.travis.yml

configure.ac

crmd/callbacks.c

crmd/fsa_defines.h

crmd/lrm.c

crmd/te_callbacks.c

crmd/te_events.c

doc/Clusters_from_Scratch/en-US/Ch-Installation.txt

extra/resources/HealthSMART

extra/resources/Makefile.am

fencing/fence_legacy

include/crm/common/mainloop.h

include/crm/crm.h

include/crm/services.h

lib/cluster/cluster.c

lib/common/Makefile.am

lib/common/mainloop.c

lib/fencing/st_client.c

lib/lrmd/lrmd_client.c

lib/pengine/complex.c

lib/pengine/rules.c

lib/pengine/utils.c

lib/services/Makefile.am

lib/services/services.c

lib/services/services_linux.c

lrmd/lrmd.c

lrmd/lrmd_private.h

lrmd/main.c

mcp/pacemaker.service.in

pacemaker.spec.in

pengine/allocate.c

pengine/graph.c

pengine/native.c

pengine/test10/bug-1572-2.xml

pengine/test10/isolation-clone.xml

pengine/test10/isolation-restart-all.xml

pengine/test10/isolation-start-all.xml

pengine/test10/master-5.xml

pengine/test10/master-6.xml

tools/Makefile.am

tools/crm_mon.service.in

tools/crm_resource.c

xml/Makefile.am

xml/crm_mon.rng

xml/upgrade-1.3.xsl

Merge pull request #703 from ClusterLabs/1.1
3073c2b19e03
Actions