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

Fix duplicate timeout directive #17030

Merged
merged 2 commits into from
Oct 31, 2017

Conversation

imcsk8
Copy link
Contributor

@imcsk8 imcsk8 commented Oct 24, 2017

When haproxy.router.openshift.io/timeout is set the template
is setting the timeout directive twice.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503637

When haproxy.router.openshift.io/timeout is set the template
is setting the timeout directive twice.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503637
@imcsk8 imcsk8 requested a review from knobunc October 24, 2017 23:35
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 24, 2017
@imcsk8 imcsk8 requested a review from pecameron October 24, 2017 23:36
@imcsk8
Copy link
Contributor Author

imcsk8 commented Oct 24, 2017

PTAL @openshift/networking

@pravisankar
Copy link

pravisankar commented Oct 24, 2017

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 24, 2017
@@ -346,10 +346,6 @@ backend be_secure:{{$cfgIdx}}
timeout server {{$value}}
{{- end }} {{/* end balance algorithm setting. */}}
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the comment {{/* end balance algorithm setting. */}} actually correct?

I think I'd just lose it.

@knobunc
Copy link
Contributor

knobunc commented Oct 26, 2017

/test

@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 30, 2017
Copy link
Contributor

@knobunc knobunc left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 30, 2017
@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 30, 2017
@knobunc
Copy link
Contributor

knobunc commented Oct 30, 2017

/approve

Thanks @imcsk8

@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: imcsk8, knobunc, pravisankar

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@knobunc
Copy link
Contributor

knobunc commented Oct 31, 2017

/kind bug

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Oct 31, 2017
@pravisankar
Copy link

/retest

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 1f2c61a into openshift:master Oct 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/routing kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants