Diffusion Pacemaker 383a88792cac

Merge branch '1.1'
383a88792cac
Actions

Description

Merge branch '1.1'

Conflicts:
cts/CTSlab.py
lrmd/lrmd.c

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Jul 21 2014, 6:52 AM

Parents

rP93a037d25fcd: Test: cli: Update regression test output
rPede6da0bd86b: Test: cts: One less use of ClusterManager as a variable array

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

93a037d25fcd Test: cli: Update regression test output
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
dae7bb73424d Log: Turn off the default log file if a real one is specified
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
bed0ddb1eb6e Log: Do not unconditionally send crm_perror output to stderr
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5749ee767819 Merge pull request #560 from yuusuke/fix_log
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4f66e6a89bfa Fix: allows the user to specify a log level that is output to syslog
Author
yuusuke <yusk.iida@gmail.com>
Browse Repository
No Audits
026944ebfad7 Fix: logrotate: maxsize is not supported by older versions
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
02caa585b1e9 Fix: Tools: Non-daemons shouldn't abort just because xml parsing failed
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b2c2bbb2f2fd Log: Default to emitting CRIT messages only until logging is fully configured
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
85836414544c Fix: Logging: Bootstrap daemon logging before processing arguments but…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
cdac15856c84 Build: Fix rpm builds where the pkg-config version for corosync is busted
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8293bae12ff7 Test: Install psmisc for killall
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
43b3aa7408ca Fix: Upstart: Do not attempt upstart jobs if we cannot connect to dbus
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
89536caf6c0f Fix: dbus: Return 'null' if we cannot connect via dbus
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c468fa064831 Fix: systemd: Ensure the retry logic is also exercised for the 'service' class
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
718bf5bd6e28 Test: lrmd: Update the systemd agent to test long running actions
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
58fc13053e02 Fix: crm_simulate: Remove resource states and transient attributes when a node…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8c4e369ea777 Fix: crm_verify: Perform a full set of calculations whenever the status section…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e4a60992d814 Log: PE: Correctly warn when resources require fencing but fencing is disabled
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a2c2ee9236ae Refactor: PE: Always use pe_fence_node to mark nodes as unclean
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c78b4b8283f2 Fix: lrmd: Handle systemd reporting 'done' before a resource is actually stopped
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a48cbf971d6a Test: cts: Fix the --choose option
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0011589d60b7 Doc: Clusters from Scratch: Fix the Installation chapter
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c055f1bd7a70 Doc: Pacemaker Explained: Update the introduction
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f56ec9bd0861 Doc: Clusters from Scratch: Update the intro and installation chapters
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e7277770211a Build: Use the 'correct' dependancy for packages using pkgconfig
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c25046fc4d5c Doc: Pacemaker Explained: Improve the readability of the section on resource…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b27ad01f47bb Doc: Pacemaker Explained: Include information on using master/slave resource in…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
440da7f59ac4 Merge pull request #553 from gao-yan/remove-unknown-conflicting-node
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c3f1a7f8912f Doc: Update some into images
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
47c79326a8da Merge pull request #555 from gao-yan/logrotate
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0eb41daf622c Fix: attrd: Remove offline nodes from node cache for "peer-remove" requests
Author
gao-yan
Browse Repository
No Audits
ba8d3cdcee5f Fix: membership: Prevent use-after-free in reap_crm_member()
Author
gao-yan
Browse Repository
No Audits
68d5738dbda3 Fix: cluster: Remove unknown offline nodes with conflicting unames from node…
Author
gao-yan
Browse Repository
No Audits
afdac6aa7792 Feature: extra: Add logrotate configuration file for /var/log/pacemaker.log
Author
gao-yan
Browse Repository
No Audits
7703f2c6ac1c Merge pull request #552 from xiali/1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
144f3c04e190 Fix: PE: Correctly detect empty tags
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
dcde798e30d2 PE: Fix type
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b48732bc7394 Fix: xml: Ensure realloc didn't fail
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9098ae1669ed Fix: crmd: Only write fence_averride if open() returns a positive file…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2fc2f5c0a11b Fix: PE: Potential use-of-NULL
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1b4aaf448a90 Fix: tools: Non-recurring memory leak
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
41150b138c5b Fix: PE: Earlier checks for NULL
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
98c2b4f44227 Fix: PE: Potential use-of-NULL
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9ce0ed120785 Fix: ipc: Buffer size cannot be negative
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0c784450f257 Fix: xml: Prevent possible array underflow
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
33f89c8d78ad Fix: mcp: Let daemons know when they have been respawned by the mcp
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a009556b756e Test:cts: fix RemoteBaremetal step2 move resource action failed issue
Author
Xia Li <xli@suse.com>
Browse Repository
No Audits
d6431a7a54a8 Fix: PE: Correctly observe requires=nothing
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c97575b82713 Fix: crmd: Remove state of unknown nodes with conflicting unames from CIB
Author
gao-yan
Browse Repository
No Audits

Changes (50)

Path

Size

attrd/

cib/

crmd/

cts/

doc/

Clusters_from_Scratch/

en-US/

images/

Pacemaker_Explained/

en-US/

Ap-Changes.txt

Ch-Advanced-Resources.txt

extra/

	logrotate/

Makefile.am

fencing/

main.c

include/

crm/

cluster/

internal.h

common/

logging.h

pengine/

internal.h

lib/

cluster/

common/

pengine/

services/

lrmd/

mcp/

pengine/

test10/

tools/

rP383a88792cac

View Options

GNUmakefile

View Options

attrd/commands.c

View Options

attrd/main.c

View Options

cib/main.c

View Options

configure.ac

View Options

crmd/main.c

View Options

crmd/membership.c

View Options

crmd/te_utils.c

View Options

cts/CTSlab.py

View Options

cts/CTStests.py

View Options

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

View Options

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

View Options

doc/Clusters_from_Scratch/en-US/images/pcmk-internals.svg

View Options

doc/Clusters_from_Scratch/en-US/images/pcmk-stack.svg

View Options

doc/Pacemaker_Explained/en-US/Ap-Changes.txt

View Options

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

View Options

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

View Options

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

View Options

extra/Makefile.am

View Options

extra/logrotate/Makefile.am

View Options

extra/logrotate/pacemaker.in

View Options

fencing/main.c

View Options

include/crm/cluster/internal.h

View Options

include/crm/common/logging.h

View Options

include/crm/pengine/internal.h

View Options

lib/cluster/corosync.c

View Options

lib/cluster/membership.c

View Options

lib/common/ipc.c

View Options

lib/common/logging.c

View Options

lib/common/xml.c

View Options

lib/pengine/unpack.c

View Options

lib/pengine/utils.c

View Options

lib/services/dbus.c

View Options

lib/services/upstart.c

View Options

lrmd/lrmd.c

View Options

lrmd/main.c

View Options

lrmd/regression.py.in

View Options

mcp/pacemaker.c

View Options

pacemaker.spec.in

View Options

pengine/constraints.c

View Options

pengine/main.c

View Options

pengine/native.c

View Options

pengine/test10/rec-node-12.dot

View Options

pengine/test10/rec-node-12.exp

View Options

tools/cibadmin.c

View Options

tools/crm_resource.c

View Options

tools/crm_simulate.c

View Options

tools/crm_verify.c

View Options

tools/regression.tools.exp

Merge branch '1.1'383a88792cacActions

Description

Details

Event Timeline

Merged Changes

Changes (50)

rP383a88792cac

GNUmakefile

attrd/commands.c

attrd/main.c

cib/main.c

configure.ac

crmd/main.c

crmd/membership.c

crmd/te_utils.c

cts/CTSlab.py

cts/CTStests.py

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

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

doc/Clusters_from_Scratch/en-US/images/pcmk-internals.svg

doc/Clusters_from_Scratch/en-US/images/pcmk-stack.svg

doc/Pacemaker_Explained/en-US/Ap-Changes.txt

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

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

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

extra/Makefile.am

extra/logrotate/Makefile.am

extra/logrotate/pacemaker.in

fencing/main.c

include/crm/cluster/internal.h

include/crm/common/logging.h

include/crm/pengine/internal.h

lib/cluster/corosync.c

lib/cluster/membership.c

lib/common/ipc.c

lib/common/logging.c

lib/common/xml.c

lib/pengine/unpack.c

lib/pengine/utils.c

lib/services/dbus.c

lib/services/upstart.c

lrmd/lrmd.c

lrmd/main.c

lrmd/regression.py.in

mcp/pacemaker.c

pacemaker.spec.in

pengine/constraints.c

pengine/main.c

pengine/native.c

pengine/test10/rec-node-12.dot

pengine/test10/rec-node-12.exp

tools/cibadmin.c

tools/crm_resource.c

tools/crm_simulate.c

tools/crm_verify.c

tools/regression.tools.exp

Merge branch '1.1'
383a88792cac
Actions