]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3560552 2e6e391)
Merge PR #34978 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 12 May 2020 18:59:51 +0000 (11:59 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 12 May 2020 18:59:51 +0000 (11:59 -0700)
* refs/pull/34978/head:
qa/tasks/cephfs/mount.py: always setup the NAT rules
qa/tasks/cephfs/mount.py: fall back to use ip command to setup the bridge

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

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