]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commita952f84bd152a0baadbe4bfa05e41f1de4dc6fad
treef5e4262cc45540ba1ed08a1e3df5abfd97c73334tree | snapshot
parent1b94f34061b3924cdd0ababfa79fc36046030b12commit | diff
parent0227ab7570c41383bf2e87eb98077f9bb0effdbccommit | diff
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>
src/mon/MgrMonitor.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.