Merge branch 'master' of github.com:ClusterLabs/pacemaker
Conflicts:
crmd/throttle.c
Description
Description
Details
Details
- Provenance
Andrew Beekhof <andrew@beekhof.net> Authored on Nov 17 2013, 9:59 PM - Parents
- rP2383f6c469bf: Merge pull request #389 from gao-yan/first-throttle-update
rP1b7d22a11d90: Fix: election: Correctly hook up the timeout callback - Branches
- Unknown
- Tags
Event Timeline
Merged Changes
Merged Changes