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

Description

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

Details

Provenance

Authored on Aug 16 2017, 12:21 AM

Parents

rP4cf078b3b46d: Merge pull request #1321 from nyetwurk/nyet-PR-4
rP5ce481caa150: Test: PE: Update bundle regression tests now that notify works

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

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

4cf078b3b46d Merge pull request #1321 from nyetwurk/nyet-PR-4
Author
kgaillot
Browse Repository
No Audits
738fd0ad32b3 Add missing top_srcdir in xslt_DATA assignment
Author
Nye Liu <nyet@mrv.com>
Browse Repository
No Audits
3b9ee2fd38fd Add a few missing .gitignores
Author
Nye Liu <nyet@mrv.com>
Browse Repository
No Audits
b88d411c8e2c Properly support pristine source build where top_builddir != top_srcdir
Author
Nye Liu <nyet@mrv.com>
Browse Repository
No Audits
547b8587e830 Merge pull request #1320 from wenningerk/fix_stonith_reregister
Author
kgaillot
Browse Repository
No Audits
4ad87e494d56 Fix: stonith-ng: make fencing-device reappear properly after reenabling
Author
wenningerk
Browse Repository
No Audits
0e6e303d85b5 Merge pull request #1316 from jnpkrn/cleanup-crmd-includes
Author
kgaillot
Browse Repository
No Audits
34e9970d1910 Merge pull request #1318 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
7c48e62f84a1 Low: crmd: don't need meta-data after resource is deleted
Author
kgaillot
Browse Repository
No Audits
1ef917cc43bc Refactor: libpe_status,pengine: add details field to action structure
Author
kgaillot
Browse Repository
No Audits
9c04e6d107d4 Low: crmd: only get meta-data for OCF and stonith agents
Author
kgaillot
Browse Repository
No Audits
dfe2a8a6e1a5 Low: libcrmcommon: provide function for whether meta-data is needed
Author
kgaillot
Browse Repository
No Audits
1758c8ed6d7b Refactor: libcrmcommon: move operation-related functions to separate source…
Author
kgaillot
Browse Repository
No Audits
ffb94ac364da Refactor: crmd: cache parsed agent meta-data rather than raw XML
Author
kgaillot
Browse Repository
No Audits
27dad9e39193 Low: crmd,libtransitioner: stop injecting meta-data actions
Author
kgaillot
Browse Repository
No Audits
ff81567ca121 Low: libcrmcommon: generate agent key without :: if no provider
Author
kgaillot
Browse Repository
No Audits
b88d7e0799b0 Refactor: librmd,libcrmservice: move meta-data faking to services library
Author
kgaillot
Browse Repository
No Audits
1411bd4881ed Doc: liblrmd: document limitations of get_metadata() API call
Author
kgaillot
Browse Repository
No Audits
00fed62ed489 Fix: pengine: avoid fence loop for remote nodes
Author
kgaillot
Browse Repository
No Audits
d312bbbdbf9e Log: attrd: don't log error if CIB doesn't have an alerts section
Author
kgaillot
Browse Repository
No Audits
2041de96d45d Refactor: attrd,crmd,liblrmd: pass lrmd connection to alert functions
Author
kgaillot
Browse Repository
No Audits
8b9cc1dc7fb8 Refactor: attrd: restructure lrmd connection function
Author
kgaillot
Browse Repository
No Audits
d134f83b4f01 Merge pull request #1317 from jnpkrn/sigfpe+typos
Author
kgaillot
Browse Repository
No Audits
f8bad85d5445 Typo: occur{ -> r}({a -> e}nce|ing)
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
18f5ef524ca8 Low: logging: ensure blackbox gets generated on arithmetic error
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
e844abf638c8 Cleanup: crmd: drop superfluous includes
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
6f92152ee035 Merge pull request #1315 from jnpkrn/doc
Author
kgaillot
Browse Repository
No Audits
ac6885500e17 Doc: PE: be more specific how source-dir-root works for bundles
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
a5ed415ca9fc Doc: fix the BigO formula for the former crm_ends_with
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
3badb2ec5bb2 Merge pull request #1305 from jnpkrn/crm_mon.cgi
Author
kgaillot
Browse Repository
No Audits
d28399ba642d Merge pull request #1311 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
5d07c672d93b Build: xml: handle version numbers properly when generating schemas
Author
kgaillot
Browse Repository
No Audits
b046bcaed64f Merge pull request #1310 from nyetwurk/nyet-PR-2
Author
kgaillot
Browse Repository
No Audits
c6e7f4ca1b47 Properly detect if rpm is missing
Author
Nye Liu <nyet@mrv.com>
Browse Repository
No Audits
e438181c0e88 Med: crm_mon: overcome crm_system_name no longer influenced with argv
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
1e0356466a58 Optimize: special-case crm_ends_with: BigO( M+N+(M-N) -> M+N )
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
eaea6ba8493c Med: crm_mon: make CGI bail out on suspicious arguments
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
1c080fb873ad Low: crm_mon: make CGI bail out properly and w/o help screen
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
65eb4452e20d Low: crm_mon: canonical casing of Content-Type CGI header field
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
989f1a819b52 Merge pull request #1308 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
d69a8ec92f90 Refactor: libcrmcommon: add enum for validator type
Author
kgaillot
Browse Repository
No Audits
9b543c7add8b Doc: xml: update function name in documentation
Author
kgaillot
Browse Repository
No Audits
1bf9dea57497 Refactor: libcrmcommon: define data type for schema version
Author
kgaillot
Browse Repository
No Audits
1b7549acfbfb Test: travis: python-central no longer needed on Travis CI
Author
kgaillot
Browse Repository
No Audits
7a2b74cc32db Refactor: libcrmcommon: drop no-longer-needed alert key functions
Author
kgaillot
Browse Repository
No Audits
2f176ae6af6e Fix: libcrmcommon: handle schema versions properly
Author
kgaillot
Browse Repository
No Audits
226bc4bf7718 Merge pull request #1309 from HideoYamauchi/correct_alert
Author
kgaillot
Browse Repository
No Audits
f77d4fc84c6d Mid: lrmd: Fix resource trap transmission.
Author
HideoYamauchi
Browse Repository
No Audits
f4d44321b22a Merge pull request #1306 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
61520bc7d582 Low: attrd: don't reconnect to lrmd if already connected
Author
kgaillot
Browse Repository
No Audits

Changes (80)

Path

Size

attrd/

attrd_common_alerts.c

cib/

crmd/

doc/

Pacemaker_Explained/

en-US/

Ch-Advanced-Resources.txt

extra/

cluster-helper

resources/

ClusterMon

fencing/

main.c

include/

crm/

common/

lrmd_alerts_internal.h

pengine/

lib/

cib/

common/

lrmd/

pengine/

services/

transition/

lrmd/

mcp/

pengine/

test10/

remote-fence-unclean-3.dot

remote-fence-unclean-3.exp

remote-fence-unclean-3.summary

tools/

crm_mon.c

crm_resource_runtime.c

crm_simulate.c

regression.validity.exp

xml/

Makefile.am

Readme.md

best-match.sh

rPe4ceb6f8ed68

View Options

.gitignore

View Options

.travis.yml

View Options

ChangeLog

View Options

Makefile.am

View Options

attrd/Makefile.am

View Options

attrd/attrd_alerts.c

View Options

attrd/attrd_alerts.h

View Options

attrd/attrd_common.c

View Options

attrd/attrd_common.h

View Options

attrd/attrd_common_alerts.c

View Options

attrd/commands.c

View Options

attrd/internal.h

View Options

attrd/legacy.c

View Options

attrd/main.c

View Options

autogen.sh

View Options

cib/io.c

View Options

crmd/Makefile.am

View Options

crmd/cib.c

View Options

crmd/control.c

View Options

crmd/crmd_alerts.c

View Options

crmd/crmd_alerts.h

View Options

crmd/crmd_lrm.h

View Options

crmd/crmd_metadata.c

View Options

crmd/crmd_metadata.h

View Options

crmd/lrm.c

View Options

crmd/lrm_state.c

View Options

crmd/pengine.c

View Options

crmd/subsystems.c

View Options

crmd/te_actions.c

View Options

crmd/tengine.c

View Options

doc/Pacemaker_Explained/en-US/Ch-Advanced-Resources.txt

View Options

extra/cluster-helper

View Options

extra/resources/ClusterMon

View Options

fencing/main.c

View Options

include/crm/common/alerts_internal.h

View Options

include/crm/common/internal.h

View Options

include/crm/common/logging.h

View Options

include/crm/common/util.h

View Options

include/crm/lrmd.h

View Options

include/crm/lrmd_alerts_internal.h

View Options

include/crm/pengine/status.h

View Options

include/crm/services.h

View Options

include/crm/transition.h

View Options

include/crm_internal.h

View Options

lib/cib/cib_file.c

View Options

lib/common/Makefile.am

View Options

lib/common/alerts.c

View Options

lib/common/logging.c

View Options

lib/common/operations.c

View Options

lib/common/schemas.c

View Options

lib/common/strings.c

View Options

lib/common/utils.c

View Options

lib/common/xml.c

View Options

lib/lrmd/lrmd_alerts.c

View Options

lib/lrmd/lrmd_client.c

View Options

lib/pengine/rules_alerts.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/services/services_private.h

View Options

lib/transition/unpack.c

View Options

lib/transition/utils.c

View Options

lrmd/lrmd_alert_api.c

View Options

lrmd/remote_ctl.c

View Options

mcp/pacemaker.sysconfig

View Options

pengine/allocate.c

View Options

pengine/graph.c

View Options

pengine/native.c

View Options

pengine/test10/remote-fence-unclean-3.dot

View Options

pengine/test10/remote-fence-unclean-3.exp

View Options

pengine/test10/remote-fence-unclean-3.summary

View Options

tools/crm_mon.c

View Options

tools/crm_resource_runtime.c

View Options

tools/crm_simulate.c

View Options

tools/regression.validity.exp

View Options

xml/Makefile.am

View Options

xml/Readme.md

View Options

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

Description

Details

Event Timeline

Merged Changes

Changes (80)

rPe4ceb6f8ed68

.gitignore

.travis.yml

ChangeLog

Makefile.am

attrd/Makefile.am

attrd/attrd_alerts.c

attrd/attrd_alerts.h

attrd/attrd_common.c

attrd/attrd_common.h

attrd/attrd_common_alerts.c

attrd/commands.c

attrd/internal.h

attrd/legacy.c

attrd/main.c

autogen.sh

cib/io.c

crmd/Makefile.am

crmd/cib.c

crmd/control.c

crmd/crmd_alerts.c

crmd/crmd_alerts.h

crmd/crmd_lrm.h

crmd/crmd_metadata.c

crmd/crmd_metadata.h

crmd/lrm.c

crmd/lrm_state.c

crmd/pengine.c

crmd/subsystems.c

crmd/te_actions.c

crmd/tengine.c

doc/Pacemaker_Explained/en-US/Ch-Advanced-Resources.txt

extra/cluster-helper

extra/resources/ClusterMon

fencing/main.c

include/crm/common/alerts_internal.h

include/crm/common/internal.h

include/crm/common/logging.h

include/crm/common/util.h

include/crm/lrmd.h

include/crm/lrmd_alerts_internal.h

include/crm/pengine/status.h

include/crm/services.h

include/crm/transition.h

include/crm_internal.h

lib/cib/cib_file.c

lib/common/Makefile.am

lib/common/alerts.c

lib/common/logging.c

lib/common/operations.c

lib/common/schemas.c

lib/common/strings.c

lib/common/utils.c

lib/common/xml.c

lib/lrmd/lrmd_alerts.c

lib/lrmd/lrmd_client.c

lib/pengine/rules_alerts.c

lib/pengine/unpack.c

lib/pengine/utils.c

lib/services/Makefile.am

lib/services/services.c

lib/services/services_linux.c

lib/services/services_private.h

lib/transition/unpack.c

lib/transition/utils.c

lrmd/lrmd_alert_api.c

lrmd/remote_ctl.c

mcp/pacemaker.sysconfig

pengine/allocate.c

pengine/graph.c

pengine/native.c

pengine/test10/remote-fence-unclean-3.dot

pengine/test10/remote-fence-unclean-3.exp

pengine/test10/remote-fence-unclean-3.summary

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