runzexia 35100c8385 Merge branch 'master' into devops-docs ...

Signed-off-by: runzexia <runzexia@yunify.com>

# Conflicts:
#	pkg/apis/tenant/v1alpha2/register.go

2019-06-10 10:34:49 +08:00

..

register.go

Merge branch 'master' into devops-docs

2019-06-10 10:34:49 +08:00