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

Description

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

Details

Provenance

Authored on Jan 24 2016, 9:15 PM

Parents

rP3e1da8e60da1: Merge pull request #899 from gao-yan/device-active-pids
rP231b10115446: Doc: CfS: Indicate how to pass naked options such as --ssh

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

3e1da8e60da1 Merge pull request #899 from gao-yan/device-active-pids
Author
kgaillot
Browse Repository
No Audits
1672823db5c4 Refactor: fencing: Functionize adding and removing active pids of device
Author
gao-yan
Browse Repository
No Audits
b97344684ec9 Merge pull request #788 from gao-yan/concurrent-fencing
Author
kgaillot
Browse Repository
No Audits
716c0bc29546 Merge pull request #896 from kgaillot/build
Author
kgaillot
Browse Repository
No Audits
73bd9d50a6e1 Build: rpmlintrc: update for new logrotate script location
Author
kgaillot
Browse Repository
No Audits
36031fc9db32 Merge pull request #895 from jnpkrn/build-spec-refresh
Author
kgaillot
Browse Repository
No Audits
d666af8af55b Merge pull request #803 from gao-yan/spec-package-files
Author
kgaillot
Browse Repository
No Audits
e5210be68779 Build: spec: associate subpackage with correct licenses
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
cdc6272a5332 Build: spec: prefer proper %license tag if available
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
c525c5d0e6cb Build: spec: rely on system-wide RPM macros if available
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
c2ecb67bf2b7 Build: spec: fix redundant BR of python
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
f5782b600eb5 Build: spec: fix redundant BR of pkgconfig
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
460388256677 Build: spec: C++ compiler is not something currently needed
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
f74c413cc687 Build: spec: fix whitespace inconsistencies
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
ba7a743c30bf Merge pull request #894 from jnpkrn/build-fix-printw-test
Author
kgaillot
Browse Repository
No Audits
03331744d212 Build: printw test: prevent console mode not available in crm_mon
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
08a617c22371 Build: printw test: no need to link with all the libs so far
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
1fc728766db5 Build: spec: Move the normal resource agents into pacemaker-cli package
Author
gao-yan
Browse Repository
No Audits
c99deb0cd65a Merge pull request #893 from ClusterLabs/1.1
Author
kgaillot
Browse Repository
No Audits
70404b0e5ecb Merge pull request #892 from kgaillot/1.1
Author
kgaillot
Browse Repository
No Audits
525521f3b9ab Doc: update change log for 1.1.14
Author
kgaillot
Browse Repository
No Audits
f0b585a6ad5a Merge pull request #891 from wenningerk/coverity_1.1
Author
kgaillot
Browse Repository
No Audits
93b9f2c30dd4 Fix: fencing: free only after last usage
Author
wenningerk
Browse Repository
No Audits
2bf9946f2d4f Fix: crmd: 0 is a valid fd
Author
wenningerk
Browse Repository
No Audits
0ecd7ac63e64 Fix: cib: don't have code that is shortcircuited in plugin-mode compiled
Author
wenningerk
Browse Repository
No Audits
71164ccf8d41 Merge pull request #886 from wferi/sanitize
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5e804ec3eab2 Merge pull request #887 from wenningerk/systemd_stuff
Author
kgaillot
Browse Repository
No Audits
6aae8542abed Fix RHBZ#1286316: Do an ordered shutdown of systemd resources
Author
wenningerk
Browse Repository
No Audits
7dbae2376d39 Merge pull request #885 from wferi/typo-fix
Author
kgaillot
Browse Repository
No Audits
3658508e37d0 Don't override any libdir containing $prefix
Author
Ferenc Wágner <wferi@niif.hu>
Browse Repository
No Audits
5e8586ffd6da Fix typos: forsee -> foresee, spilt -> split
Author
Ferenc Wágner <wferi@niif.hu>
Browse Repository
No Audits
aff80aece3f3 Build: spec: Move attrd_updater into pacemaker-cli package
Author
gao-yan
Browse Repository
No Audits
ce576cfb4898 Build: spec: Move logrotate configuration file into pacemaker-cli package
Author
gao-yan
Browse Repository
No Audits
81ef956cb000 Build: spec: Move xml schema files and PCMK-MIB.txt into pacemaker-cli package
Author
gao-yan
Browse Repository
No Audits
7c63f4cb17ff Feature: fencing: Support concurrent fencing actions on each device
Author
gao-yan
Browse Repository
No Audits
c9b53ad91a5f Test: pengine: Support concurrent fencing (regression test)
Author
gao-yan
Browse Repository
No Audits
d9800577e916 Feature: pengine: Support concurrent fencing
Author
gao-yan
Browse Repository
No Audits

Changes (24)

Path

Size

cib/

crmd/

fencing/

include/

crm/

fencing/

internal.h

pengine/

status.h

lib/

pengine/

services/

lrmd/

pengine/

test10/

	concurrent-fencing.dot
	rec-node-14.dot

	concurrent-fencing.exp
	rec-node-14.exp

	concurrent-fencing.scores
	rec-node-14.scores

	concurrent-fencing.summary
	rec-node-14.summary

	concurrent-fencing.xml
	rec-node-14.xml

rpmlintrc

rPd9e1395633ca

View Options

ChangeLog

View Options

README.markdown

View Options

cib/callbacks.c

View Options

configure.ac

View Options

crmd/fsa_defines.h

View Options

crmd/te_utils.c

View Options

fencing/commands.c

View Options

fencing/internal.h

View Options

fencing/main.c

View Options

include/crm/fencing/internal.h

View Options

include/crm/pengine/status.h

View Options

lib/pengine/common.c

View Options

lib/pengine/unpack.c

View Options

lib/services/systemd.c

View Options

lrmd/lrmd.c

View Options

pacemaker.spec.in

View Options

pengine/allocate.c

View Options

pengine/regression.sh

View Options

pengine/test10/concurrent-fencing.dot

View Options

pengine/test10/concurrent-fencing.exp

View Options

pengine/test10/concurrent-fencing.scores

View Options

pengine/test10/concurrent-fencing.summary

View Options

pengine/test10/concurrent-fencing.xml

View Options

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

Description

Details

Event Timeline

Merged Changes

Changes (24)

rPd9e1395633ca

ChangeLog

README.markdown

cib/callbacks.c

configure.ac

crmd/fsa_defines.h

crmd/te_utils.c

fencing/commands.c

fencing/internal.h

fencing/main.c

include/crm/fencing/internal.h

include/crm/pengine/status.h

lib/pengine/common.c

lib/pengine/unpack.c

lib/services/systemd.c

lrmd/lrmd.c

pacemaker.spec.in

pengine/allocate.c

pengine/regression.sh

pengine/test10/concurrent-fencing.dot

pengine/test10/concurrent-fencing.exp

pengine/test10/concurrent-fencing.scores

pengine/test10/concurrent-fencing.summary

pengine/test10/concurrent-fencing.xml

rpmlintrc

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