From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 24 Apr 2017 04:20:42 +0000 (+0800)
Subject: Merge pull request #14711 from jcsp/wip-19738
X-Git-Tag: v12.0.3~278
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a952f84bd152a0baadbe4bfa05e41f1de4dc6fad;p=ceph.git

Merge pull request #14711 from jcsp/wip-19738

mon: don't call propose_pending in prepare_update()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

a952f84bd152a0baadbe4bfa05e41f1de4dc6fad