Merge pull request #1177 from ClusterLabs/1.1
7bffbaa79b4e
Actions

Description

Merge pull request #1177 from ClusterLabs/1.1

Pull 1.1.16-rc2 from 1.1 branch into master

Details

Provenance

kgaillot	Authored on Nov 18 2016, 12:58 PM
GitHub <noreply@github.com>	Committed on Nov 18 2016, 12:58 PM

Parents

rPc4ca169218a5: Merge pull request #1176 from kgaillot/rc2
rPd7c7ba25b9b6: Merge pull request #1172 from lusoheart/snmptraps

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

c4ca169218a5 Merge pull request #1176 from kgaillot/rc2
Author
kgaillot
Browse Repository
No Audits
9a871a3e5622 Doc: update change log for 1.1.16-rc2
Author
kgaillot
Browse Repository
No Audits
a145ce1df062 Test: cts: fix patterns for verifying corosync kill
Author
kgaillot
Browse Repository
No Audits
4b8fa1fdff80 Low: mcp,pacemaker_remote: order after time-sync
Author
kgaillot
Browse Repository
No Audits
2e6cb06c116d Doc: libcrmcommon,libservices: correct license comments
Author
kgaillot
Browse Repository
No Audits
dfbd96d45366 Merge pull request #1173 from gao-yan/xml-score-attribute-mangle
Author
kgaillot
Browse Repository
No Audits
be2d4633d7f9 Merge pull request #1174 from jnpkrn/build-cont
Author
kgaillot
Browse Repository
No Audits
583bbde44924 Build: configure: fix fouled parameter expansion
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
74eae9e8f59d xml: rng: Keep score-attribute{,-mangle} in the existing RelaxNG schema files…
Author
gao-yan
Browse Repository
No Audits
b6f251a13fad Merge pull request #1170 from jnpkrn/crm_report-bug-tracker
Author
kgaillot
Browse Repository
No Audits
f596dccae6c8 Low: crm_report: linux-foundation.org bug tracker deprecated
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits

Changes (15)

Path

Size

ChangeLog

configure.ac

cts/

patterns.py

lib/

common/

cib_secrets.c

watchdog.c

services/

upstart.c

lrmd/

pacemaker_remote.service.in

mcp/

tools/

xml/

rP7bffbaa79b4e

View Options

ChangeLog

View Options

configure.ac

View Options

cts/patterns.py

View Options

lib/common/cib_secrets.c

View Options

lib/common/watchdog.c

View Options

lib/services/upstart.c

View Options

lrmd/pacemaker_remote.service.in

View Options

mcp/pacemaker.service.in

View Options

tools/crm_report.in

View Options

xml/constraints-1.0.rng

View Options

xml/constraints-1.2.rng

View Options

xml/constraints-2.1.rng

View Options

xml/constraints-2.2.rng

View Options

xml/constraints-2.3.rng

View Options

Merge pull request #1177 from ClusterLabs/1.17bffbaa79b4eActions

Description

Details

Event Timeline

Merged Changes

Changes (15)

rP7bffbaa79b4e

ChangeLog

configure.ac

cts/patterns.py

lib/common/cib_secrets.c

lib/common/watchdog.c

lib/services/upstart.c

lrmd/pacemaker_remote.service.in

mcp/pacemaker.service.in

tools/crm_report.in

xml/constraints-1.0.rng

xml/constraints-1.2.rng

xml/constraints-2.1.rng

xml/constraints-2.2.rng

xml/constraints-2.3.rng

xml/constraints-2.6.rng

Merge pull request #1177 from ClusterLabs/1.1
7bffbaa79b4e
Actions