Bug#587427: Trivial merge

2010-07-05 Thread Simon Horman
On Mon, Jul 05, 2010 at 01:59:57PM +0200, Florian Haas wrote: > tags: fixed-upstream > > I've just trivially merged upstream 1.0.9.1 into the sid branch in my > local checkout, run a test build, and deployed to a cluster. Merge, > build, and deploy works flawlessly. > > Since squeeze is now on py

Bug#587427: Trivial merge

2010-07-05 Thread Florian Haas
tags: fixed-upstream I've just trivially merged upstream 1.0.9.1 into the sid branch in my local checkout, run a test build, and deployed to a cluster. Merge, build, and deploy works flawlessly. Since squeeze is now on python 2.6, pacemaker will no longer support being installed alongside heartbe