From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 18 Jul 2018 14:16:41 +0000 (-0700)
Subject: Merge pull request #23070 from smithfarm/wip-24942-mimic
X-Git-Tag: v13.2.1~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b832f0c113d22278f5b084be7e567c8b7681f1e9;p=ceph.git

Merge pull request #23070 from smithfarm/wip-24942-mimic

mimic: build/ops: ceph.git has two different versions of dpdk in the source tree

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

b832f0c113d22278f5b084be7e567c8b7681f1e9