Shuting Zhao
|
6b5e935e49
|
Merge branch 'feature/reports-cli' of https://github.com/evalsocket/kyverno into policyreport
# Conflicts:
# Makefile
# cmd/kyverno/main.go
# go.mod
# go.sum
# pkg/client/clientset/versioned/clientset.go
# pkg/client/clientset/versioned/fake/clientset_generated.go
# pkg/client/clientset/versioned/fake/register.go
# pkg/client/clientset/versioned/scheme/register.go
# pkg/client/informers/externalversions/factory.go
# pkg/client/informers/externalversions/generic.go
# pkg/client/listers/kyverno/v1/expansion_generated.go
# pkg/policy/common.go
# pkg/policy/controller.go
# pkg/policy/existing.go
# pkg/policyviolation/builder.go
# pkg/policyviolation/generator.go
# pkg/webhooks/server.go
# pkg/webhooks/validate_audit.go
# pkg/webhooks/validation.go
|
2020-10-12 18:30:37 -07:00 |
|
