From: Orit Wasserman <owasserm@redhat.com>
Date: Fri, 20 May 2016 08:19:23 +0000 (+0200)
Subject: Merge pull request #9149 from cbodley/wip-rgw-zone-modify-master
X-Git-Tag: v11.0.0~492
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=063155e7fcdd80708c7943218dfd681f6de3d196;p=ceph.git

Merge pull request #9149 from cbodley/wip-rgw-zone-modify-master

rgw: add_zone only clears master_zone if --master=false
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
---

063155e7fcdd80708c7943218dfd681f6de3d196