]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit01aea7f7e15f208a7bb740d5267b0b56a220983f
treedfef9422ac3bd518a4a4126ce5d898d193964e4b
parent3560552cbc9595ca370d6d875a3ccfc3f19500fe
parent2e6e3916a0989ad7caabac1b76409f9814169ac4
Merge PR #34978 into master

* 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>
qa/tasks/cephfs/mount.py