]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbddc56 b8fceaf)
Merge PR #25756 into master
authorSage Weil <sage@redhat.com>
Fri, 4 Jan 2019 02:37:54 +0000 (20:37 -0600)
committerSage Weil <sage@redhat.com>
Fri, 4 Jan 2019 02:37:54 +0000 (20:37 -0600)
* refs/pull/25756/head:
vstart.sh: force setting dashboard options before first mgr starts
mon/ConfigMonitor: add --force flag to 'config set'

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.