search

openshift / origin-aggregated-logging

139 stars 230 forks source link

LOG-1562: upgrade rubygem 'addressable' to the 2.0.8 version #2158

Closed vparfonov closed 3 years ago

vparfonov commented 3 years ago

Signed-off-by: Vitalii Parfonov vparfonov@redhat.com

Description

upgrade rubygem 'addressable' to the 2.0.8 version.

/cc /assign @jcantrill

/cherry-pick

Links

openshift-ci[bot] commented 3 years ago

Skipping CI for Draft Pull Request. If you want CI signal for your change, please convert it to an actual PR. You can still manually trigger a test run with /test all

vparfonov commented 3 years ago

/test all

jcantrill commented 3 years ago

@vparfonov it is odd to me that even though the lock file has very minimal changes there are a significant number of other files in other gems that have changed. Are you certain you had a "clean" gem install from which to work?

jcantrill commented 3 years ago

/lgtm

jcantrill commented 3 years ago

/approve

openshift-ci[bot] commented 3 years ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, vparfonov

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/origin-aggregated-logging/blob/master/OWNERS)~~ [jcantrill] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
jcantrill commented 3 years ago

/cherrypick release-5.1

openshift-cherrypick-robot commented 3 years ago

@jcantrill: #2158 failed to apply on top of branch "release-5.1":

Applying: LOG-1562: upgrade rubygem 'addressable' to the 2.0.8 version
Using index info to reconstruct a base tree...
M   fluentd/Gemfile.lock
M   fluentd/rh-manifest.txt
A   fluentd/vendored_gem_src/fluent-plugin-grafana-loki/fluent-plugin-grafana-loki.gemspec
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): fluentd/vendored_gem_src/fluent-plugin-grafana-loki/fluent-plugin-grafana-loki.gemspec deleted in HEAD and modified in LOG-1562: upgrade rubygem 'addressable' to the 2.0.8 version. Version LOG-1562: upgrade rubygem 'addressable' to the 2.0.8 version of fluentd/vendored_gem_src/fluent-plugin-grafana-loki/fluent-plugin-grafana-loki.gemspec left in tree.
Removing fluentd/vendored_gem_src/addressable/spec/addressable/rack_mount_compat_spec.rb
Auto-merging fluentd/rh-manifest.txt
Auto-merging fluentd/Gemfile.lock
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 LOG-1562: upgrade rubygem 'addressable' to the 2.0.8 version
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".
In response to [this](https://github.com/openshift/origin-aggregated-logging/pull/2158#issuecomment-891296690): >/cherry-pick release-5.1 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-cherrypick-robot commented 3 years ago

@jcantrill: #2158 failed to apply on top of branch "release-5.1":

Applying: LOG-1562: upgrade rubygem 'addressable' to the 2.0.8 version
Using index info to reconstruct a base tree...
M   fluentd/Gemfile.lock
M   fluentd/rh-manifest.txt
A   fluentd/vendored_gem_src/fluent-plugin-grafana-loki/fluent-plugin-grafana-loki.gemspec
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): fluentd/vendored_gem_src/fluent-plugin-grafana-loki/fluent-plugin-grafana-loki.gemspec deleted in HEAD and modified in LOG-1562: upgrade rubygem 'addressable' to the 2.0.8 version. Version LOG-1562: upgrade rubygem 'addressable' to the 2.0.8 version of fluentd/vendored_gem_src/fluent-plugin-grafana-loki/fluent-plugin-grafana-loki.gemspec left in tree.
Removing fluentd/vendored_gem_src/addressable/spec/addressable/rack_mount_compat_spec.rb
Auto-merging fluentd/rh-manifest.txt
Auto-merging fluentd/Gemfile.lock
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 LOG-1562: upgrade rubygem 'addressable' to the 2.0.8 version
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".
In response to [this](https://github.com/openshift/origin-aggregated-logging/pull/2158#issuecomment-891296989): >/cherrypick release-5.1 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.