Kubernetes Submit Queue 2541c16692 Merge pull request #40942 from ymqytw/extract_util_from_SMPatch ...

Automatic merge from submit-queue (batch tested with PRs 40289, 40877, 40879, 39972, 40942)

Extract util used by jsonmergepatch and SMPatch

followup  https://github.com/kubernetes/kubernetes/pull/40666#discussion_r99198931

Extract some util out of the `strategicMergePatch` to make `jsonMergePatch` doesn't depend on `strategicMergePatch`.

```release-note
None
```

cc: @liggitt

2017-02-04 04:43:10 -08:00

..

api

Merge pull request #40877 from yujuhong/rm_mirror_annotation

2017-02-04 04:43:06 -08:00

apimachinery/tests

Update generated files

2017-01-29 21:41:45 +01:00

apis

Add generated artifacts

2017-02-03 17:19:53 -05:00

auth

Update authn/authz owners and reviewers

2017-01-27 08:55:44 -05:00

capabilities

…

client

CRI Portforward needs to forward websocket ports

2017-02-01 18:03:42 -07:00

cloudprovider

Merge pull request #40763 from derekwaynecarr/log-noise-aws

2017-01-31 20:40:47 -08:00

controller

Merge pull request #40918 from k82cn/pv_ctrl_typo

2017-02-03 07:37:25 -08:00

conversion

…

credentialprovider

…

features

update critical pod annotation flag gate to mention that BestEffort pods are not supported

2017-02-02 11:32:23 -08:00

fieldpath

Merge pull request #34533 from yuexiao-wang/fix-commends

2017-01-30 09:05:22 -08:00

fields

…

generated

Add generated artifacts

2017-02-03 17:19:53 -05:00

hyperkube

…

kubeapiserver

Update generated files

2017-02-03 08:15:46 +01:00

kubectl

Merge pull request #40942 from ymqytw/extract_util_from_SMPatch

2017-02-04 04:43:10 -08:00

kubelet

Merge pull request #39972 from derekwaynecarr/pod-cgroups-default

2017-02-04 04:43:08 -08:00

kubemark

Rename cgroups-per-qos flag to not be experimental

2017-02-03 17:10:53 -05:00

labels

…

master

Update generated files

2017-02-03 08:15:46 +01:00

metrics

…

probe

…

proxy

move client/record

2017-01-31 19:14:13 -05:00

quota

Update generated files

2017-01-29 21:41:45 +01:00

registry

Plumb subresource through subjectaccessreview

2017-02-03 16:07:55 -05:00

routes

Update generated files

2017-02-03 08:15:46 +01:00

runtime

…

security

…

securitycontext

securitycontext: move docker-specific logic into kubelet/dockertools

2017-01-27 12:25:46 -08:00

serviceaccount

Allow reading ECDSA key files containing parameter blocks

2017-02-01 10:18:58 -05:00

ssh

…

types

…

util

Merge pull request #40645 from brendandburns/fr

2017-01-31 21:27:52 -08:00

version

…

volume

Prevent pv controller from forcefully overwrite provisioned volume name

2017-02-01 12:19:20 -05:00

watch

…

BUILD

Update generated files

2017-02-03 08:15:46 +01:00

OWNERS

…