]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2657 from ceph/wip-9053-9301-firefly
authorSamuel Just <sam.just@inktank.com>
Thu, 6 Nov 2014 18:26:21 +0000 (10:26 -0800)
committerSamuel Just <sam.just@inktank.com>
Thu, 6 Nov 2014 18:26:21 +0000 (10:26 -0800)
mon: backport two paxos fixes to firefly

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

Trivial merge