Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Updates vault-helper to 0.9.15 #803

Merged
merged 1 commit into from
May 1, 2019

Conversation

JoshVanL
Copy link
Contributor

/assign @simonswine

Upgrade vault-helper to 0.9.15

Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>
@jetstack-bot jetstack-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 26, 2019
@jetstack-bot
Copy link
Collaborator

[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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jetstack-bot jetstack-bot added area/puppet Indicates a PR is affecting Puppet manifests approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 26, 2019
@simonswine
Copy link
Contributor

/retest

@simonswine
Copy link
Contributor

/lgtm

@jetstack-bot jetstack-bot added the lgtm Indicates that a PR is ready to be merged. label May 1, 2019
@jetstack-bot jetstack-bot merged commit d8fbb55 into jetstack:master May 1, 2019
@simonswine
Copy link
Contributor

/cherrypick release-0.6

@jetstack-bot
Copy link
Collaborator

@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:

/cherrypick release-0.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

jetstack-bot added a commit that referenced this pull request May 27, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/puppet Indicates a PR is affecting Puppet manifests dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants