From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 12 Sep 2017 22:56:32 +0000 (-0700)
Subject: Merge PR #17679 into master
X-Git-Tag: v13.0.1~950
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f48113f50f78c9934221c417e5998e632a93381d;p=ceph.git

Merge PR #17679 into master

* refs/remotes/upstream/pull/17679/head:
	qa: get asok path from ceph.conf
	qa: use config_path property instead of literal

Reviewed-by: John Spray <john.spray@redhat.com>
---

f48113f50f78c9934221c417e5998e632a93381d