From: Jason Dillaman Date: Wed, 1 Feb 2017 16:17:23 +0000 (-0500) Subject: Merge pull request #12948 from trociny/wip-17020 X-Git-Tag: v12.0.0~38 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b8023c5dd09d2c4be576e597f9e6db78c35cb9d;p=ceph.git Merge pull request #12948 from trociny/wip-17020 rbd-mirror: add support for active/passive daemon instances Reviewed-by: Jason Dillaman --- 8b8023c5dd09d2c4be576e597f9e6db78c35cb9d