Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release branch to master #1544

Merged
merged 15 commits into from
Apr 21, 2021
Merged

Merge release branch to master #1544

merged 15 commits into from
Apr 21, 2021

Conversation

lucacome
Copy link
Member

No description provided.

@lucacome lucacome requested a review from a team April 19, 2021 19:58
@lucacome lucacome self-assigned this Apr 19, 2021
@lucacome lucacome requested review from pleshakov and soneillf5 and removed request for a team April 19, 2021 19:58
@github-actions github-actions bot added chore Pull requests for routine tasks documentation Pull requests/issues for documentation labels Apr 19, 2021
@lucacome lucacome requested a review from ciarams87 April 19, 2021 19:58
@@ -26,7 +26,7 @@ The table below summarizes the key difference between nginxinc/kubernetes-ingres
| JWT validation | Not supported | Not supported | Supported |
| Session persistence | Supported via a third-party module | Not supported | Supported |
| Canary testing (by header, cookie, weight) | Supported via annotations | Supported via custom resources | Supported via custom resources |
| Configuration templates *1 | See the [template](https://github.com/kubernetes/ingress-nginx/blob/master/rootfs/etc/nginx/template/nginx.tmpl) | See the [templates](../internal/configs/version1) | See the [templates](../internal/configs/version1) |
| Configuration templates *1 | See the [template](https://github.com/kubernetes/ingress-nginx/blob/v1.11.0/rootfs/etc/nginx/template/nginx.tmpl) | See the [templates](../internal/configs/version1) | See the [templates](../internal/configs/version1) |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

different repo

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep I noticed too, but that's in the release branch already. I guess we'll have to fix it later.

@lucacome lucacome mentioned this pull request Apr 21, 2021
@lucacome lucacome merged commit a69d124 into master Apr 21, 2021
@lucacome lucacome deleted the chore/release-to-master branch April 21, 2021 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Pull requests for routine tasks documentation Pull requests/issues for documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants