Kubernetes Submit Queue a2d7dc5b36 Merge pull request #46784 from alexandercampbell/fix-reaper-timeout-bug ...

Automatic merge from submit-queue

Fix Reaper timeout bug

This PR is an fix to the issue [noticed](https://github.com/kubernetes/kubernetes/pull/46468#discussion_r118589512) in a previous PR.

Previous behavior was to calculate a timeout but then ignore it, using `reaper.timeout` instead.
New behavior is to use the calculated timeout for `waitForStatefulSet`, which is passed to the Scaler.

Thanks to @foxish and @apelisse for pointing me in the right direction.

**Release note**:

```release-note
NONE
```

2017-07-28 15:30:24 -07:00

..

api

Bump ReplicaSet to apps/v1beta2

2017-07-26 09:51:41 -07:00

apimachinery/tests

Move pkg/apimachinery/test to apimachinery

2017-07-08 08:48:38 +08:00

apis

Merge pull request #47897 from xilabao/dead-code-in-rbac-helper

2017-07-28 02:13:02 -07:00

auth

Only do string trim when it's necessary

2017-06-15 17:32:31 +08:00

bootstrap/api

run hack/update-all

2017-06-22 11:31:03 -07:00

capabilities

…

client

Merge pull request #45946 from atlassian/expose-informer-constructors

2017-07-25 11:06:51 -07:00

cloudprovider

Merge pull request #49167 from nicksardo/gce-static-unit-test

2017-07-28 07:22:39 -07:00

controller

Merge pull request #49619 from jianglingxia/jlx72616

2017-07-28 05:08:01 -07:00

conversion

…

credentialprovider

azure: acr: support auth to preview ACR w/ MSI+AAD

2017-07-18 15:22:34 -07:00

features

Update factory.go informers to update equivalence cache

2017-07-18 23:55:01 +08:00

fieldpath

Add Pod UID (metadata.uid) to downward API env var

2017-06-27 16:54:35 +08:00

fields

…

generated

Merge pull request #48746 from janetkuo/apps-v1beta2

2017-07-21 11:47:21 -07:00

hyperkube

…

kubeapiserver

Remove default binding of system:node role to system:nodes group

2017-07-26 13:53:14 -04:00

kubectl

Merge pull request #46784 from alexandercampbell/fix-reaper-timeout-bug

2017-07-28 15:30:24 -07:00

kubelet

Merge pull request #48822 from caseydavenport/drive-by-fix-todo

2017-07-28 03:10:37 -07:00

kubemark

Merge pull request #40050 from mtaufen/standalone-mode

2017-07-25 12:14:43 -07:00

labels

…

master

Don't enable apps/v1beta2 by default

2017-07-20 10:25:21 -07:00

printers

Merge pull request #45813 from xilabao/add-psp-in-kubectl-describe

2017-07-28 07:22:32 -07:00

probe

update godep

2017-07-20 11:03:49 -07:00

proxy

remove duplicated import and wrong alias name of api package

2017-07-25 10:04:25 +08:00

quota

use informers for quota evaluation of core resources where possible

2017-07-19 15:52:39 -04:00

registry

Autogen

2017-07-26 10:56:55 -07:00

routes

…

runtime

…

security

Refactor: pkg/util into sub-pkgs

2017-07-18 14:34:08 +08:00

securitycontext

run hack/update-all

2017-06-22 11:31:03 -07:00

serviceaccount

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

ssh

…

types

…

util

add reflector metrics

2017-07-25 09:01:37 -04:00

version

Convert go_binary linkstamp to x_defs

2017-06-08 14:59:55 -07:00

volume

Merge pull request #49744 from dims/volunteer-as-cinder-approver

2017-07-28 08:15:29 -07:00

watch

…

BUILD

generated innocuous change

2017-07-21 14:29:59 -07:00

OWNERS

…