]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9908dc3 3b6f6f1)
Merge PR #35953 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 18 Jul 2020 03:20:47 +0000 (20:20 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 18 Jul 2020 03:20:47 +0000 (20:20 -0700)
* refs/pull/35953/head:
qa: Fix name collisions

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
1  2 
qa/tasks/cephfs/test_volumes.py patch | diff1 | diff2 | blob | history

diff --cc qa/tasks/cephfs/test_volumes.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.