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 current v1.3 to master #1697

Merged
merged 2 commits into from
Jun 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/user-guide/kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ metadata:
name: cheeses
annotations:
kubernetes.io/ingress.class: traefik
traefik.frontend.rule.type: pathprefixstrip
traefik.frontend.rule.type: PathPrefixStrip
spec:
rules:
- host: cheeses.minikube
Expand Down
2 changes: 1 addition & 1 deletion examples/k8s/cheeses-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Ingress
metadata:
name: cheeses
annotations:
traefik.frontend.rule.type: pathprefixstrip
traefik.frontend.rule.type: PathPrefixStrip
spec:
rules:
- host: cheeses.minikube
Expand Down