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.

Sign up for GitHub

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

Jump to bottom

UPSTREAM: <carry>: Fix to avoid REST API calls at log level 2. #13844

Merged
merged 1 commit into from
May 4, 2017
Merged

UPSTREAM: <carry>: Fix to avoid REST API calls at log level 2. #13844

merged 1 commit into from
May 4, 2017

Conversation

aveshagarwal
Copy link
Contributor

@ncdc
Copy link
Contributor

ncdc commented Apr 20, 2017

Commit message is incorrect. Needs to be UPSTREAM: <carry>

@aveshagarwal aveshagarwal changed the title UPSTREAM: carry: Fix to avoid REST API calls at log level 2. UPSTREAM: <carry>: Fix to avoid REST API calls at log level 2. Apr 20, 2017
@aveshagarwal
Copy link
Contributor Author

@ncdc fixed hopefully it is correct this time.

@derekwaynecarr
Copy link
Member

LGTM [merge]

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@eparis
Copy link
Member

eparis commented Apr 24, 2017

[test][merge] from whole internet being dead

@derekwaynecarr
Copy link
Member

[test] [merge]

@eparis
Copy link
Member

eparis commented Apr 25, 2017

(FYI, i think they have merge turned off for rebase)

@derekwaynecarr
Copy link
Member

@eparis -- thanks for the reminder, i was being dense.

@derekwaynecarr
Copy link
Member

@eparis is there a merge-cancel action?

@eparis
Copy link
Member

eparis commented Apr 25, 2017

i think they just turned it off. so you can leave the tag.

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 1, 2017
@ncdc
Copy link
Contributor

ncdc commented May 3, 2017

@aveshagarwal please rebase. New file location is vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/httplog/log.go

@aveshagarwal
Copy link
Contributor Author

@ncdc fixed it. Thanks.

@ncdc
Copy link
Contributor

ncdc commented May 3, 2017

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to ffead55

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to ffead55

@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 3, 2017
@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1124/) (Base Commit: d97afdf)

@openshift-bot
Copy link
Contributor

openshift-bot commented May 4, 2017 •
edited

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/552/) (Base Commit: fb32130) (Image: devenv-rhel7_6207)

@openshift-bot openshift-bot merged commit dcd60bd into openshift:master May 4, 2017
@aveshagarwal aveshagarwal deleted the master-rhbz-1414813 branch July 24, 2017 13:58
@aveshagarwal aveshagarwal mentioned this pull request Aug 23, 2017
Merged
openshift-merge-robot added a commit that referenced this pull request Sep 16, 2017
@openshift-merge-robot
Merge pull request #15934 from aveshagarwal/master-rhbz-1484095
428befa 
Automatic merge from submit-queue (batch tested with PRs 16089, 16305, 16219, 15934, 16366)

UPSTREAM: <carry>: Fix to avoid REST API calls at log level 2.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1484095. Its a regression in origin master (3.7). @sjenning 

This PR is carry because the previous PR to 3.6 was carry too (#13844) due to uncertainty around upstream PR (kubernetes/kubernetes#40933).

@stevekuznetsov @deads2k  Also is something broken in the rebase process or any related scripts that previous carry PR (#13844) was dropped? Not to blame anyone, just informing as I am wondering if there are other carry PRs that got dropped and we are not aware causing regressions in future, so that if something is broken (process or script), can be fixed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@aveshagarwal @ncdc @derekwaynecarr @openshift-bot @eparis