New Upstream Snapshot - consul
There were merge conflicts while merging a new upstream version.
More details
Historical runs
- upstream-merged-conflicts: Merging upstream version 1.9.17+git20221223.1.7747384+dfsg1 resulted in conflicts.
- upstream-merged-conflicts: Merging upstream version 1.9.17+git20221220.1.f5e01f8+dfsg1 resulted in conflicts.
- run-disappeared: Jenkins job https://jenkins.debian.net/job/janitor-worker/782008/ has disappeared
- run-disappeared: Jenkins job https://jenkins.debian.net/job/janitor-worker/782008/ has disappeared
- run-disappeared: Jenkins job https://jenkins.debian.net/job/janitor-worker/782009/ has disappeared
- quilt-refresh-error: An error occurred refreshing quilt patch provider-no-k8s.patch: Applying patch debian/patches/provider-no-k8s.patch can't find file to patch at input line 8 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Last-Update: 2019-11-10 |Forwarded: not-needed |Author: Dmitry Smirnov <onlyjob@debian.org> |Description: golang-github-hashicorp-go-discover have no k8s provider | |--- a/agent/retry_join.go |+++ b/agent/retry_join.go -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 30 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/agent/auto-config/server_addr.go |+++ b/agent/auto-config/server_addr.go -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored Patch debian/patches/provider-no-k8s.patch does not apply (enforce with -f)
- codemod-command-failed: Script ['deb-new-upstream', '--snapshot', '--refresh-patches'] failed to run with code 1
- quilt-refresh-error: An error occurred refreshing quilt patch provider-no-k8s.patch: Applying patch debian/patches/provider-no-k8s.patch can't find file to patch at input line 8 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Last-Update: 2019-11-10 |Forwarded: not-needed |Author: Dmitry Smirnov <onlyjob@debian.org> |Description: golang-github-hashicorp-go-discover have no k8s provider | |--- a/agent/retry_join.go |+++ b/agent/retry_join.go -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 30 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/agent/auto-config/server_addr.go |+++ b/agent/auto-config/server_addr.go -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored Patch debian/patches/provider-no-k8s.patch does not apply (enforce with -f)