From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 20 Jun 2019 13:27:04 +0000 (-0700)
Subject: Merge PR #28194 into master
X-Git-Tag: v15.1.0~2414
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f26493cc255bed6f0c16c8b52699bd1fd7744ccb;p=ceph.git

Merge PR #28194 into master

* refs/pull/28194/head:
	test_volume_client: declare only one default for python version
	test_volume_client: don't shadow class variable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

f26493cc255bed6f0c16c8b52699bd1fd7744ccb