Skip to content

Commit 394052a

Browse files
jakedoublevjakedoublev
authored
chore(policy): address merge conflict in proto gencode (#1711)
1. merge with `main` latest 2. `make proto-generate` to build latest gencode from protos to handle the merge conflict in `protocol/go/policy/objects.pb.go`
1 parent f64e0cd commit 394052a

File tree

15 files changed

+775
-243
lines changed

15 files changed

+775
-243
lines changed

‎docs/grpc/index.html‎

Lines changed: 32 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/openapi/policy/attributes/attributes.swagger.json‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/openapi/policy/kasregistry/key_access_server_registry.swagger.json‎

Lines changed: 20 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/openapi/policy/namespaces/namespaces.swagger.json‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/openapi/policy/resourcemapping/resource_mapping.swagger.json‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/openapi/policy/subjectmapping/subject_mapping.swagger.json‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/openapi/policy/unsafe/unsafe.swagger.json‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)