]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01eca21 9bc1a74)
Merge PR #34782 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 2 Jun 2020 14:40:39 +0000 (07:40 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 2 Jun 2020 14:40:39 +0000 (07:40 -0700)
* refs/pull/34782/head:
qa/tasks/cephfs/mount.py: remove netns name parsing in mountpoint setter
qa/tasks/vstart_runner.py: add kwargs parameter to ignore the ones it does not understand

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
qa/tasks/vstart_runner.py patch | diff1 | diff2 | blob | history

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