From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 15 May 2017 12:43:55 +0000 (-0400)
Subject: Merge pull request #15048 from trociny/wip-19907
X-Git-Tag: v12.0.3~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b86362036418951d1fc15f98e954855d3965d05;p=ceph.git

Merge pull request #15048 from trociny/wip-19907

rbd-mirror: resolve admin socket path names collision

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

6b86362036418951d1fc15f98e954855d3965d05