Kubernetes Submit Queue 2cc9650e7e Merge pull request #39306 from hex108/oom_score_adj ...

Automatic merge from submit-queue (batch tested with PRs 38084, 39306)

Small improve for GetContainerOOMScoreAdjust

In `GetContainerOOMScoreAdjust`, make logic more clear for the case `oomScoreAdjust >= besteffortOOMScoreAdj`. If `besteffortOOMScoreAdj`  is defined to another value(e.g. 996), suppose `oomScoreAdjust` is 999, the function will return 998(which equals 999 - 1) instead of 995(996 -1).

2017-01-04 07:18:07 -08:00

..

admission

refactored admission to avoid internal client references

2017-01-03 15:50:12 -05:00

api

Merge pull request #36245 from fraenkel/env_configmap

2017-01-03 23:28:09 -08:00

apimachinery

autogenerated

2016-12-29 13:04:10 -08:00

apis

Merge pull request #39309 from wojtek-t/register_necessary_object

2017-01-03 12:59:10 -08:00

auth

Move pkg/api.{Context,RequestContextMapper} into pkg/genericapiserver/api/request

2017-01-03 14:57:33 +01:00

capabilities

autoupdate BUILD files

2016-12-12 13:30:07 -08:00

client

Update generated for 2017

2017-01-01 23:11:09 -08:00

cloudprovider

autogenerated

2016-12-29 13:04:10 -08:00

controller

Merge pull request #39355 from kargakis/update-rc-manager

2017-01-04 05:18:29 -08:00

conversion

autogenerated

2016-12-29 13:04:10 -08:00

credentialprovider

autogenerated

2016-12-29 13:04:10 -08:00

dns

autogenerated

2016-12-29 13:04:10 -08:00

fieldpath

autogenerated

2016-12-29 13:04:10 -08:00

fields

autogenerated

2016-12-29 13:04:10 -08:00

generated

Generated code

2017-01-03 11:45:38 -05:00

genericapiserver

omit the reason if we don't have an error when using rbac

2017-01-04 11:41:43 +08:00

healthz

autogenerated

2016-12-29 13:04:10 -08:00

httplog

autogenerated

2016-12-29 13:04:10 -08:00

hyperkube

autoupdate BUILD files

2016-12-12 13:30:07 -08:00

kubeapiserver

refactored admission to avoid internal client references

2017-01-03 15:50:12 -05:00

kubectl

Merge pull request #36245 from fraenkel/env_configmap

2017-01-03 23:28:09 -08:00

kubelet

Merge pull request #39306 from hex108/oom_score_adj

2017-01-04 07:18:07 -08:00

kubemark

Update NodeRef to v1.ObjectReference.

2016-12-22 16:28:20 +08:00

labels

autogenerated

2016-12-29 13:04:10 -08:00

master

Move pkg/api.{Context,RequestContextMapper} into pkg/genericapiserver/api/request

2017-01-03 14:57:33 +01:00

metrics

rename /release_1_5 to /clientset

2016-12-14 12:39:48 -08:00

probe

autogenerated

2016-12-29 13:04:10 -08:00

proxy

autogenerated

2016-12-29 13:04:10 -08:00

quota

autogenerated

2016-12-29 13:04:10 -08:00

registry

Merge pull request #39149 from deads2k/rbac-33-poststarthook

2017-01-03 08:21:54 -08:00

routes

autoupdate BUILD files

2016-12-12 13:30:07 -08:00

runtime

Update generated for 2017

2017-01-01 23:11:09 -08:00

security

autogenerated

2016-12-29 13:04:10 -08:00

securitycontext

autogenerated

2016-12-29 13:04:10 -08:00

selection

autoupdate BUILD files

2016-12-12 13:30:07 -08:00

serviceaccount

autogenerated

2016-12-29 13:04:10 -08:00

ssh

Use the builtin timeout provided by SSH

2016-12-29 18:49:24 -05:00

storage

autogenerated

2016-12-29 13:04:10 -08:00

types

autoupdate BUILD files

2016-12-12 13:30:07 -08:00

util

Add a PrivateKeyFromFile method to certutil for parsing a private key from a file

2017-01-03 23:36:23 +02:00

version

Rename build-tools/ back to build/

2016-12-14 13:42:15 -08:00

volume

Merge pull request #37380 from jsafrane/rbd-errors

2017-01-03 09:45:22 -08:00

watch

Update generated for 2017

2017-01-01 23:11:09 -08:00

OWNERS

…