Diffusion Pacemaker a1835403eec7

Merge branch 'master' into 1.1
a1835403eec7
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'master' into 1.1

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on May 28 2014, 6:50 PM

Parents

rP0e2f2156fde4: Fix: attrd: Ensure attribute dampening is always observed
rP7f08e76274ff: Merge pull request #518 from jnpkrn/pengine-typo

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

7f08e76274ff Merge pull request #518 from jnpkrn/pengine-typo
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
4fcdecbd99cc Low: pengine: fix typo
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
5d48d928dff6 Merge pull request #517 from davidvossel/1.1.12-testing
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4f82449daf9b Fix: membership: Avoid duplicate peer entries in the peer cache
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b434fee7ca72 Build: add a cppcheck helper
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a6df0df40ca1 Bug cl#5184 - Ensure pending probes that ultimately fail are correctly updated
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2e93df7175ab Merge pull request #514 from fuhu/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1e14b99cf09e chinese document translation
Author
hfu <askfuhu@gmail.com>
Browse Repository
No Audits

Changes (13)

Path

Size

crmd/

doc/

Clusters_from_Scratch/

zh-CN/

Ap-Configuration.po

Ap-Corosync-Conf.po

Author_Group.po

Ch-Active-Active.po

Ch-Active-Passive.po

Ch-Installation.po

lib/

cluster/

common/

pengine/

rPa1835403eec7

GNUmakefile

Loading...

crmd/lrm.c

Loading...

doc/Clusters_from_Scratch/zh-CN/Ap-Configuration.po

Loading...

doc/Clusters_from_Scratch/zh-CN/Ap-Corosync-Conf.po

Loading...

doc/Clusters_from_Scratch/zh-CN/Author_Group.po

Loading...

doc/Clusters_from_Scratch/zh-CN/Book_Info.po

Loading...

doc/Clusters_from_Scratch/zh-CN/Ch-Active-Active.po

Loading...

doc/Clusters_from_Scratch/zh-CN/Ch-Active-Passive.po

Loading...

doc/Clusters_from_Scratch/zh-CN/Ch-Apache.po

Loading...

doc/Clusters_from_Scratch/zh-CN/Ch-Installation.po

Loading...

lib/cluster/membership.c

Loading...

lib/common/utils.c

Loading...

pengine/graph.c

Loading...