]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9149 from cbodley/wip-rgw-zone-modify-master
authorOrit Wasserman <owasserm@redhat.com>
Fri, 20 May 2016 08:19:23 +0000 (10:19 +0200)
committerOrit Wasserman <owasserm@redhat.com>
Fri, 20 May 2016 08:19:23 +0000 (10:19 +0200)
rgw: add_zone only clears master_zone if --master=false
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1  2 
src/rgw/rgw_rados.cc

Simple merge