]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #17679 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 12 Sep 2017 22:56:32 +0000 (15:56 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 12 Sep 2017 22:56:32 +0000 (15:56 -0700)
commitf48113f50f78c9934221c417e5998e632a93381d
treef247d4a299294a3b508b0ad3f10bd2fe8811d4de
parent4d8971e1c8916f1e470c7b011c80b9b3f9b7aca9
parentbc3a00af0fe681f9fad1f2050e13f6f3ea3515b0
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>