From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 21 Jun 2018 23:56:16 +0000 (-0700)
Subject: Merge pull request #22474 from yuriw/wip-yuriw-p2p-luminous
X-Git-Tag: v12.2.6~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b13b89c6b37c50c2f2d35f78f63defc0c916db2;p=ceph.git

Merge pull request #22474 from yuriw/wip-yuriw-p2p-luminous

qa/tests - added tag 12.2.5. to the mix and removed -x path as unneeded

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

2b13b89c6b37c50c2f2d35f78f63defc0c916db2