]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #11469 from dachary/wip-17538-jewel
authorCasey Bodley <cbodley@users.noreply.github.com>
Thu, 20 Oct 2016 15:16:38 +0000 (11:16 -0400)
committerGitHub <noreply@github.com>
Thu, 20 Oct 2016 15:16:38 +0000 (11:16 -0400)
jewel: rgw:user email can modify to empty when it has values

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/rgw/rgw_admin.cc
src/rgw/rgw_user.cc

Simple merge
Simple merge