search

Kong / kong-operator

Kong Operator for Kubernetes and OpenShift
https://konghq.com
Apache License 2.0
58 stars 27 forks source link

merge main into fork/certified #34

Closed mflendrich closed 4 years ago

mflendrich commented 4 years ago

This PR merges the current tip of main into fork/certified so that the fork does not drift further away from the mainline.

mflendrich commented 4 years ago

@rainest: to keep the commit history clean, consider merging this PR using command-line instructions (see the link next to the merge button on this PR) but using --ff instead of --no-ff