]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #31168 into master
authorSage Weil <sage@redhat.com>
Mon, 28 Oct 2019 19:59:43 +0000 (14:59 -0500)
committerSage Weil <sage@redhat.com>
Mon, 28 Oct 2019 19:59:43 +0000 (14:59 -0500)
commitd927374bb4990d67bac6aace23301fab52ebe9de
tree35a6fbdaf7c2402792472cd8151f3c8ea76847d5
parent1365b45c267b469e9918aba0e5c912a04c6aa4c4
parent85c750be26539f8e16458a49a52c057297bba8bb
Merge PR #31168 into master

* refs/pull/31168/head:
ceph-daemon: try py2 import before py3
qa/suites/rados/singleton-nomsgr/ceph-daemon: make sure python3 is installed
qa/standalone/test_ceph_damon.sh: test with python2 and python3
mgr/ssh: python, not python3
ceph-daemon: python, not python3
ceph-daemon: os.makedirs
ceph-daemon: configparser is ConfigParser on py2
ceph-daemon: avoid py3-isms

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
src/ceph-daemon
src/pybind/mgr/ssh/module.py