]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitcb4d8a31583bcd76de2828e1fcbde1451b6de0eb
tree9a61080d35d0322376b077f9d10eb6e4b9e47152
parentfbddc56abdd897a5816e8a50a4c93dcbdddc8648
parentb8fceaf6f9dadf3eb39064f6d02831ad977a70d4
Merge PR #25756 into master

* 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>