api
api copied to clipboard
[release-1.10] Security fix on URL normalization (GoldPanda).
Manual cherrypick required.
#1982 failed to apply on top of branch "release-1.10":
Applying: Security fix on URL normalization options (GoldPanda).
Using index info to reconstruct a base tree...
M mesh/v1alpha1/config.pb.go
M mesh/v1alpha1/config.proto
M mesh/v1alpha1/istio.mesh.v1alpha1.gen.json
M mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
M python/istio_api/mesh/v1alpha1/config_pb2.py
Falling back to patching base and 3-way merge...
Auto-merging python/istio_api/mesh/v1alpha1/config_pb2.py
CONFLICT (content): Merge conflict in python/istio_api/mesh/v1alpha1/config_pb2.py
Auto-merging mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
CONFLICT (content): Merge conflict in mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
Auto-merging mesh/v1alpha1/istio.mesh.v1alpha1.gen.json
Auto-merging mesh/v1alpha1/config.proto
Auto-merging mesh/v1alpha1/config.pb.go
CONFLICT (content): Merge conflict in mesh/v1alpha1/config.pb.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Security fix on URL normalization options (GoldPanda).
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".