Merge branch 'dev' into devops-refactor

Browse Source

# 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

...

This commit is contained in:

runzexia

2020-04-15 11:33:05 +08:00

parent 9a6ba04a37 bb9e12be3d

commit d8259160b8

8 changed files with 344 additions and 4972 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4615

api/openapi-spec/swagger.json

File diff suppressed because it is too large Load Diff