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

Automated cherry pick of #565: Removed reclaim&preempt by default. #564: Updated vendors. #566

Merged
merged 2 commits into from
Jan 25, 2019
Merged

Automated cherry pick of #565: Removed reclaim&preempt by default. #564: Updated vendors. #566

merged 2 commits into from
Jan 25, 2019

Conversation

k82cn
Copy link
Contributor

@k82cn k82cn commented Jan 25, 2019

Cherry pick of #565 #564 on release-0.4.

#565: Removed reclaim&preempt by default.
#564: Updated vendors.

k82cn added 2 commits January 25, 2019 22:45
Signed-off-by: Da K. Ma <klaus1982.cn@gmail.com>
Signed-off-by: Da K. Ma <klaus1982.cn@gmail.com>
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 25, 2019
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 25, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: k82cn

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 25, 2019
@k82cn k82cn added the lgtm Indicates that a PR is ready to be merged. label Jan 25, 2019
@k8s-ci-robot k8s-ci-robot merged commit c466e05 into kubernetes-retired:release-0.4 Jan 25, 2019
@k82cn k82cn deleted the automated-cherry-pick-of-#565-#564-upstream-release-0.4 branch January 26, 2019 01:34
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants