]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #30826 into master
authorSage Weil <sage@redhat.com>
Tue, 22 Oct 2019 15:13:51 +0000 (10:13 -0500)
committerSage Weil <sage@redhat.com>
Tue, 22 Oct 2019 15:13:51 +0000 (10:13 -0500)
commit1e817057a1ccc92e2d0ccf63ac03d3fed6096a93
treee7d881359adbae8e081fe1da3edea10120146171
parent2fbe8267b62d6afe9a7f7c743d0f05a2348bab4f
parentb05b2d34e1e6fbf68b7701d38a0096f03ac3e40c
Merge PR #30826 into master

* refs/pull/30826/head:
ceph-daemon: deploy: behave when crash keyring isn't provided
ceph-daemon: simplify calls from rm_cluster
ceph-daemon: explicitly wait for mon to start
ceph-daemon: bootstrap finish message
ceph-daemon: shell: LANG=C
ceph-daemon: verify mon IP is valid before continuing
ceph-daemon: cleanly capture stdout, err; log
ceph-daemon: --debug for more log detail
test_ceph_daemon: default to test on 127.0.0.1; accept ip as arg
ceph-daemon: bootstrap: assimilate and minimize input config file

Reviewed-by: Josh Durgin <jdurgin@redhat.com>