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

Description

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

Details

Provenance

Authored on May 11 2015, 9:12 PM

Parents

rP3eaf1e508665: Merge pull request #699 from kgaillot/cts
rP46dcc1d82c20: Fix: Fencing: Correctly handle changes to the fencing topology

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

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

3eaf1e508665 Merge pull request #699 from kgaillot/cts
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d900bb8fa2d5 Merge branch 'rikkotec-debian-ha/patches'
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6b2e5fd28736 manpage-has-bad-whatis-entry ocf_pacemaker_remote 7
Author
Richard B Winters <rik@mmogp.com>
Browse Repository
No Audits
56a10c128041 Merge pull request #705 from kgaillot/mon
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
32dc10b0c394 Fix: tools: ignore stderr from crm_mon when running via systemd
Author
kgaillot
Browse Repository
No Audits
6c5c08789983 xml: update RelaxNG schema for crm_mon XML output
Author
kgaillot
Browse Repository
No Audits
3073c2b19e03 Merge pull request #703 from ClusterLabs/1.1
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
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
852208741910 Test: cts: make log message patterns independent of function name
Author
kgaillot
Browse Repository
No Audits
7aa7e0d62912 Fix: cts: replace call to undefined usage() function
Author
kgaillot
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
48b7aae1ae01 Refactor: cts: remove dead code including unused imports
Author
kgaillot
Browse Repository
No Audits
6e18a0a0a8d8 Fix: cts: improve dummy systemd service file used in testing
Author
kgaillot
Browse Repository
No Audits
44a1cf640b7b Fix: cts: get rid of useless startup messages
Author
kgaillot
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
0a3d10edf149 Fix spelling errors in binary crm_resource
Author
Richard B Winters <rik@mmogp.com>
Browse Repository
No Audits
d3975886e39e Fix spelling error in binary stonithd
Author
Richard B Winters <rik@mmogp.com>
Browse Repository
No Audits
3274bd1d847e Fix spelling error in binary crmd
Author
Richard B Winters <rik@mmogp.com>
Browse Repository
No Audits
c1a48eb03abf Fix spelling error in binary crmd
Author
Richard B Winters <rik@mmogp.com>
Browse Repository
No Audits
99235986398a Fix spelling errors in binary libpengine
Author
Richard B Winters <rik@mmogp.com>
Browse Repository
No Audits
5d6f40638275 Fix spelling error in binary libpengine
Author
Richard B Winters <rik@mmogp.com>
Browse Repository
No Audits
ff2930b4fb26 Fix spelling error in binary libpe-status
Author
Richard B Winters <rik@mmogp.com>
Browse Repository
No Audits
1313d8bfa905 Fix spelling error in binary libcrmservice
Author
Richard B Winters <rik@mmogp.com>
Browse Repository
No Audits
2a21ff832498 Fix spelling error in binary pacemakerd
Author
Richard B Winters <rik@mmogp.com>
Browse Repository
No Audits
20a137ca83a3 Fix spelling error in binary libtransitioner
Author
Richard B Winters <rik@mmogp.com>
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

Changes (68)

Path

Size

crmd/

cts/

doc/

Clusters_from_Scratch/

en-US/

Ch-Installation.txt

Pacemaker_Remote/

en-US/

Ch-Intro.txt

extra/

resources/

fencing/

include/

crm/

common/

mainloop.h

crm.h

services.h

lib/

cluster/

common/

fencing/

lrmd/

pengine/

services/

transition/

lrmd/

mcp/

pengine/

test10/

isolation-restart-all.xml

isolation-start-all.xml

tools/

xml/

rP0f7bb7c495b1

View Options

.gitignore

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/messages.c

View Options

crmd/te_callbacks.c

View Options

crmd/te_events.c

View Options

crmd/throttle.c

View Options

cts/CIB.py

View Options

cts/CM_ais.py

View Options

cts/CM_lha.py

View Options

cts/CTS.py

View Options

cts/CTSaudits.py

View Options

cts/CTSlab.py

View Options

cts/CTStests.py

View Options

cts/OCFIPraTest.py

View Options

cts/cib_xml.py

View Options

cts/environment.py

View Options

cts/logging.py

View Options

cts/patterns.py

View Options

cts/remote.py

View Options

cts/watcher.py

View Options

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

View Options

doc/Pacemaker_Remote/en-US/Ch-Intro.txt

View Options

extra/resources/HealthSMART

View Options

extra/resources/Makefile.am

View Options

extra/resources/remote

View Options

fencing/commands.c

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/unpack.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

lib/transition/utils.c

View Options

lrmd/lrmd.c

View Options

lrmd/lrmd_private.h

View Options

lrmd/main.c

View Options

mcp/pacemaker.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 branch 'master' of github.com:ClusterLabs/pacemaker0f7bb7c495b1Actions

Description

Details

Event Timeline

Merged Changes

Changes (68)

rP0f7bb7c495b1

.gitignore

.travis.yml

configure.ac

crmd/callbacks.c

crmd/fsa_defines.h

crmd/lrm.c

crmd/messages.c

crmd/te_callbacks.c

crmd/te_events.c

crmd/throttle.c

cts/CIB.py

cts/CM_ais.py

cts/CM_lha.py

cts/CTS.py

cts/CTSaudits.py

cts/CTSlab.py

cts/CTStests.py

cts/OCFIPraTest.py

cts/cib_xml.py

cts/environment.py

cts/logging.py

cts/patterns.py

cts/remote.py

cts/watcher.py

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

doc/Pacemaker_Remote/en-US/Ch-Intro.txt

extra/resources/HealthSMART

extra/resources/Makefile.am

extra/resources/remote

fencing/commands.c

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/unpack.c

lib/pengine/utils.c

lib/services/Makefile.am

lib/services/services.c

lib/services/services_linux.c

lib/transition/utils.c

lrmd/lrmd.c

lrmd/lrmd_private.h

lrmd/main.c

mcp/pacemaker.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 branch 'master' of github.com:ClusterLabs/pacemaker
0f7bb7c495b1
Actions