Merge branch 'master' of github.com:ClusterLabs/pacemaker
Conflicts:
cib/callbacks.h
cib/notify.c
cib/remote.c
lrmd/lrmd.c
lrmd/lrmd_private.h
lrmd/main.c
Description
Description
Details
Details
- Provenance
Andrew Beekhof <andrew@beekhof.net> Authored on Jan 23 2013, 4:45 PM - Parents
- rP20de0ab77ea2: Merge pull request #209 from davidvossel/lrmd_tls_init
rPc2564f48596f: Test: Fix ignore patterns for the Reattach test - Branches
- Unknown
- Tags
Event Timeline
Merged Changes
Merged Changes