-
Committer:
Andres Rodriguez
-
Date:
2011-11-16 17:11:37 UTC
-
mfrom:
(1.1.7 sid)
-
Revision ID:
andreserl@ubuntu.com-20111116171137-tkr3xoe20osrjf0o
Tags: 1:3.9.2-5ubuntu1
* Merge from debian unstable (LP: #891248). Remaining changes:
- debian/control: add conflicts/replaces for ldirectord.
* debian/control: Fix the Conflicts and Replaces lines of resource-agents
to make sure that cluster-agents and resource-agents are mutually
exclusive. Setting the urgency to high because this bug keeps people
from running the whole clusterstack (Closes: #646110)
* debian/patches/ocf-asterisk: Include the Asterisk PBX OCF resource agent
written by Florian Haas, Andreas Kurz and me, sponsored by hastexo