From: Samuel Just <sam.just@inktank.com>
Date: Thu, 6 Nov 2014 18:26:21 +0000 (-0800)
Subject: Merge pull request #2657 from ceph/wip-9053-9301-firefly
X-Git-Tag: v0.80.8~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23cbffaa2936dc2707b5b42f8c0e7ce804324ae2;p=ceph.git

Merge pull request #2657 from ceph/wip-9053-9301-firefly

mon: backport two paxos fixes to firefly

Reviewed-by: Joao Luis <joao@redhat.com>
---

23cbffaa2936dc2707b5b42f8c0e7ce804324ae2