runzexia
d8259160b8
Merge branch 'dev' into devops-refactor
# Conflicts:
# Makefile
# api/api-rules/violation_exceptions.list
# api/openapi-spec/swagger.json
# cmd/controller-manager/app/controllers.go
# hack/generate_client.sh
# pkg/apis/cluster/v1alpha1/openapi_generated.go
# pkg/client/informers/externalversions/generic.go
# pkg/kapis/tenant/v1alpha2/register.go
# pkg/models/tenant/devops.go
# pkg/models/tenant/workspaces.go
# pkg/simple/client/devops/fake/fakedevops.go
# tools/cmd/crd-doc-gen/main.go
2020-04-15 11:33:05 +08:00
..
2020-04-15 11:33:05 +08:00
2020-04-15 11:03:08 +08:00