search

jetstack / tarmak

A toolkit for Kubernetes cluster provisioning and lifecycle management
Apache License 2.0
269 stars 49 forks source link

Updates vault-helper to 0.9.15 #803

Closed JoshVanL closed 5 years ago

JoshVanL commented 5 years ago

/assign @simonswine 

Upgrade vault-helper to 0.9.15
jetstack-bot commented 5 years ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoshVanL

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/jetstack/tarmak/blob/master/OWNERS)~~ [JoshVanL] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
simonswine commented 5 years ago

/retest

simonswine commented 5 years ago

/lgtm

simonswine commented 5 years ago

/cherrypick release-0.6

jetstack-bot commented 5 years ago

@simonswine: #803 failed to apply on top of branch "release-0.6":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M   CHANGELOG.md
Falling back to patching base and 3-way merge...
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
Patch failed at 0001 Updates vault-helper to 0.9.15
In response to [this](https://github.com/jetstack/tarmak/pull/803#issuecomment-496133482): >/cherrypick release-0.6 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.