search

openshift / origin-aggregated-logging

139 stars 231 forks source link

Updated ingest plugin path #2144

Closed vimalk78 closed 3 years ago

vimalk78 commented 3 years ago

Description

Fixed ingest plugin path in ci-env.sh This is the path from which ingest plugin will be installed into ES image

/cc @lukas-vlcek /assign @jcantrill

/cherry-pick master

Links

jcantrill commented 3 years ago

/approve /lgtm

openshift-ci[bot] commented 3 years ago

[APPROVALNOTIFIER] This PR is APPROVED

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

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/release-5.1/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 master

openshift-cherrypick-robot commented 3 years ago

@jcantrill: #2144 failed to apply on top of branch "master":

Applying: Updated ingest plugin path
Using index info to reconstruct a base tree...
M   elasticsearch/ci-env.sh
Falling back to patching base and 3-way merge...
Auto-merging elasticsearch/ci-env.sh
CONFLICT (content): Merge conflict in elasticsearch/ci-env.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Updated ingest plugin path
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/2144#issuecomment-871680704): >/cherrypick master 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.