]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* 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>
1  2 
src/ceph-daemon
src/pybind/mgr/ssh/module.py

diff --cc src/ceph-daemon
Simple merge
Simple merge