]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d8971e bc3a00a)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.