Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes oc delete ignoring --grace-period. #15091

Merged
merged 1 commit into from Jul 7, 2017

Conversation

fabianofranz
Copy link
Member

@fabianofranz
Copy link
Member Author

[test]

@deads2k
Copy link
Contributor

deads2k commented Jul 7, 2017

@sttts saw you on the upstream

@fabianofranz
Copy link
Member Author

flake re[test]

@fabianofranz
Copy link
Member Author

[merge][severity: blocker] here and I'll address the minor comments upstream.

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 0d9a533

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 0d9a533

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3009/) (Base Commit: 83efc33) (PR Branch Commit: 0d9a533)

@@ -284,7 +284,7 @@ func ReapResult(r *resource.Result, f cmdutil.Factory, out io.Writer, isDefaultD
return nil
}

func DeleteResult(r *resource.Result, out io.Writer, ignoreNotFound bool, shortOutput bool, mapper meta.RESTMapper) error {
func DeleteResult(r *resource.Result, out io.Writer, ignoreNotFound bool, gracePeriod int, shortOutput bool, mapper meta.RESTMapper) error {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as in upstream, a godoc would be nice about this int. time.Duration would be obvious, int is not.

@sttts
Copy link
Contributor

sttts commented Jul 7, 2017

Looks good to me. Only nit: a godoc wouldn't harm for the int.

@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 7, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/1252/) (Base Commit: 349768c) (PR Branch Commit: 0d9a533) (Extended Tests: blocker) (Image: devenv-rhel7_6429)

@openshift-bot openshift-bot merged commit 2d61a5b into openshift:master Jul 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants