]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #10658 from dachary/wip-16862-jewel
authorOrit Wasserman <owasserm@redhat.com>
Fri, 26 Aug 2016 08:28:10 +0000 (10:28 +0200)
committerGitHub <noreply@github.com>
Fri, 26 Aug 2016 08:28:10 +0000 (10:28 +0200)
commit91ee75f39c05fe0c25aab2664f1fa71f858e7c6f
treedad1a21513b771e82ed0b9d4144650a849e29b8d
parentd8bdc2245ddec91c2f55d367045e4407112d2af1
parenta865f26e68a991eaf55dc5f105b7fd7cb4634bc3
Merge pull request #10658 from dachary/wip-16862-jewel

jewel: default zone and zonegroup cannot be added to a realm
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
src/rgw/rgw_admin.cc
src/rgw/rgw_rados.h