From: Sage Weil <sage@redhat.com>
Date: Mon, 28 Oct 2019 19:59:43 +0000 (-0500)
Subject: Merge PR #31168 into master
X-Git-Tag: v15.1.0~1129
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d927374bb4990d67bac6aace23301fab52ebe9de;p=ceph.git

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

d927374bb4990d67bac6aace23301fab52ebe9de