Skip to content

Commit

Permalink
Merge pull request #15934 from aveshagarwal/master-rhbz-1484095
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
openshift-merge-robot committed Sep 16, 2017
2 parents fd8b731 + 4a142df commit 428befa
Showing 1 changed file with 1 addition and 1 deletion.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 428befa

Please sign in to comment.