search

openshift / origin-aggregated-logging

139 stars 231 forks source link

LOG-1315. Updated kibana dependencies #2210

Closed igor-karpukhin closed 2 years ago

igor-karpukhin commented 2 years ago

Description

This PR resolves https://issues.redhat.com/browse/LOG-1315

/cc @periklis /assign @periklis

Links

openshift-bot commented 2 years ago

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot commented 2 years ago

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot commented 2 years ago

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot commented 2 years ago

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot commented 2 years ago

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot commented 2 years ago

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot commented 2 years ago

/retest-required

Please review the full test history for this PR and help us cut down flakes.

igor-karpukhin commented 2 years ago

/retest

igor-karpukhin commented 2 years ago

/retest

igor-karpukhin commented 2 years ago

/retest

igor-karpukhin commented 2 years ago

/retest

igor-karpukhin commented 2 years ago

/retest

periklis commented 2 years ago

/lgtm

igor-karpukhin commented 2 years ago

/cherry-pick release-5.1

openshift-cherrypick-robot commented 2 years ago

@igor-karpukhin: #2210 failed to apply on top of branch "release-5.1":

Applying: Bumped up kibana deps
.git/rebase-apply/patch:1537: trailing whitespace.
 * 
.git/rebase-apply/patch:2266: trailing whitespace.
 * 
.git/rebase-apply/patch:2735: trailing whitespace.
 * 
.git/rebase-apply/patch:2889: trailing whitespace.
 * 
.git/rebase-apply/patch:2955: trailing whitespace.
 * 
warning: squelched 103 whitespace errors
warning: 108 lines add whitespace errors.
Using index info to reconstruct a base tree...
M   .gitignore
M   kibana/Dockerfile
M   kibana/Dockerfile.in
Falling back to patching base and 3-way merge...
Auto-merging kibana/Dockerfile.in
Auto-merging kibana/Dockerfile
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bumped up kibana deps
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/2210#issuecomment-988862816): >/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.