]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b94f34 0227ab7)
Merge pull request #14711 from jcsp/wip-19738
authorKefu Chai <tchaikov@gmail.com>
Mon, 24 Apr 2017 04:20:42 +0000 (12:20 +0800)
committerGitHub <noreply@github.com>
Mon, 24 Apr 2017 04:20:42 +0000 (12:20 +0800)
mon: don't call propose_pending in prepare_update()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/mon/MgrMonitor.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/MgrMonitor.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.