Diffusion Pacemaker c5343c5611b7

Merge branch '1.1'
c5343c5611b7
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch '1.1'

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Jun 26 2014, 10:44 PM

Parents

rPba2dd8f18fce: Merge pull request #550 from gao-yan/remove-unknown-conflicting-node
rP0b2223b3583d: Test: cts: Stop Popen from blocking

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

ba2dd8f18fce Merge pull request #550 from gao-yan/remove-unknown-conflicting-node
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
50ffa212d1de Fix: crmd: Remove unknown nodes with conflicting unames from CIB
Author
gao-yan
Browse Repository
No Audits
a364a3938bdd Merge pull request #548 from gao-yan/ocf-log-setenv
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8b200b76a1d2 Merge pull request #549 from ldzhong/1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8655eed4922d Fix: controld: Return OCF_ERR_INSTALLED instead of OCF_NOT_INSTALLED
Author
Lidong Zhong <lzhong@suse.com>
Browse Repository
No Audits
574fc493cf6d Fix: lrmd: Prevent OCF agents from logging to random files due to "value" of…
Author
gao-yan
Browse Repository
No Audits
f85a9efef97b Merge pull request #546 from xiali/mybranch
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1be286a978cb Test:cts: fix shutdown pattern not found issue
Author
Xia Li <xli@suse.com>
Browse Repository
No Audits
f080f84eaf78 Merge pull request #544 from davidvossel/cts-lxc-updates
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ef000350995c Fix: ignore SIGPIPE with gnutls is in use
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b8a3044cbe77 Fix: crmd: avoid double free caused by nested hash table removal
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
cb420a045c3d Fix: crm_report: Correctly detect large files
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5d7628551f7a Merge pull request #543 from gao-yan/cib_perform_op-assert
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0c659e6af9a5 Fix: cib: cl#5222 - Prevent assert in xml_calculate_changes() on performing cib…
Author
gao-yan
Browse Repository
No Audits
f5ce59da7143 Test: tools: Remove line numbers from ACL test output
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits

Changes (15)

Path

Size

cib/

crmd/

cts/

extra/

resources/

include/

crm/

common/

lib/

cib/

common/

lrmd/

lrmd/

tools/

regression.acls.exp

report.common.in

rPc5343c5611b7

cib/remote.c

Loading...

crmd/lrm_state.c

Loading...

crmd/membership.c

Loading...

cts/CM_ais.py

Loading...

extra/resources/controld

Loading...

include/crm/common/util.h

Loading...

lib/cib/cib_remote.c

Loading...

lib/cib/cib_utils.c

Loading...

lib/common/utils.c

Loading...

lib/lrmd/lrmd_client.c

Loading...

lrmd/main.c

Loading...

lrmd/tls_backend.c

Loading...

tools/regression.acls.exp

Loading...

tools/regression.sh

Loading...

tools/report.common.in

Loading...