From: Loic Dachary <loic@dachary.org>
Date: Wed, 29 Jun 2016 07:55:26 +0000 (+0200)
Subject: Merge pull request #9327 from cbodley/wip-rgw-zone-modify-master-jewel
X-Git-Tag: v10.2.3~132
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=980abcfd3966c29b4871d5a0913051a8312d866c;p=ceph.git

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

jewel: rgw: add_zone only clears master_zone if --master=false

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

980abcfd3966c29b4871d5a0913051a8312d866c