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.

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

Move upstream 04 #37

Merged
merged 12 commits into from Jun 27, 2017
Merged

Conversation

deads2k
Copy link

@deads2k deads2k commented Jun 27, 2017

UPSTREAM_REPO_LOCATION=/home/deads/workspaces/kube/src/k8s.io/kubernetes/ hack/move-upstream.sh 49d3685d99ac8d99cf4b14cd28b85ec8c46cb10f..master

@liggitt

php-coder and others added 12 commits June 27, 2017 15:56
:100644 100644 59ff11095c... 409d65b0e0... M	cmd/kube-apiserver/app/server.go
:100644 100644 780e99c911... bdaa0f2af6... M	staging/src/k8s.io/apiserver/pkg/server/options/etcd.go
:100644 100644 98761f1827... 83ad7ae28a... M	staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory.go
:100644 100644 aea28e410b... e9092c4087... M	staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/time_proto.go
:100644 100644 3ab1d5fd1a... c0fafab9bf... M	staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/time_test.go
:100644 100644 9f9be862ca... b0aadec3fa... M	staging/src/k8s.io/client-go/tools/record/events_cache.go
:100644 100644 d45dd65cf6... dc4e6af658... M	staging/src/k8s.io/client-go/tools/record/events_cache_test.go
:100644 100644 829d4fa895... 74ad84dd95... M	staging/src/k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go
:000000 100644 0000000000... e227540940... A	staging/src/k8s.io/apiserver/pkg/authentication/request/websocket/BUILD
:000000 100644 0000000000... e007bf2d57... A	staging/src/k8s.io/apiserver/pkg/authentication/request/websocket/protocol.go
:000000 100644 0000000000... 2a21aa65d9... A	staging/src/k8s.io/apiserver/pkg/authentication/request/websocket/protocol_test.go
:100644 100644 f01638ad6d... 6f26b22757... M	staging/src/k8s.io/apiserver/pkg/util/wsstream/conn.go
:100644 100644 5910d29e81... 1e892078fe... M	pkg/kubeapiserver/authenticator/config.go
:100644 100644 39c90e9389... 61114c1c86... M	staging/src/k8s.io/apiserver/pkg/authentication/authenticatorfactory/delegating.go
:000000 100644 0000000000... b684356ed4... A	pkg/registry/core/rest/scc_patch.go
:100644 100644 66e2a7be20... ea1028e61e... M	pkg/registry/core/rest/storage_core.go
:100644 100644 2f9edf4f6c... 9970b63121... M	pkg/api/register.go
:100644 100644 5cc4e41dad... 5cfe3d1c76... M	pkg/api/testing/fuzzer.go
:100644 100644 036ad538bb... cc46e4f25f... M	pkg/api/types.go
:100644 100644 d810314681... 0454aad17d... M	pkg/api/v1/conversion.go
:100644 100644 70e68b9e1b... 4abb83709b... M	pkg/api/v1/defaults.go
:100644 100644 b47f9ae186... d31631b027... M	pkg/api/v1/defaults_test.go
:100644 100644 ba1ec882e9... 5c2dfddd11... M	pkg/api/v1/register.go
:100644 100644 2d780a09ce... 8a3a8d30ba... M	pkg/api/v1/types.go
:100644 100644 683608cab8... 1d8a0e8460... M	pkg/api/validation/validation.go
:100644 100644 38d50ef5fb... ddcc2028d7... M	pkg/api/validation/validation_test.go
:100644 100644 d0a8f67702... 2f17a7fb45... M	pkg/printers/internalversion/describe.go
:100644 100644 d02c412f4b... bb0fa9e7c0... M	pkg/printers/internalversion/describe_test.go
:100644 100644 3fc019d3ca... ea468d6665... M	pkg/printers/internalversion/printers.go
:100644 100644 ea1028e61e... 7cce77e9bb... M	pkg/registry/core/rest/storage_core.go
:100644 000000 15e5c31d9c... 0000000000... D	pkg/registry/securitycontextconstraints/BUILD
:100644 000000 dfd542f836... 0000000000... D	pkg/registry/securitycontextconstraints/doc.go
:100644 000000 2e6a36d9d5... 0000000000... D	pkg/registry/securitycontextconstraints/etcd/BUILD
:100644 000000 d2d67946b2... 0000000000... D	pkg/registry/securitycontextconstraints/etcd/etcd.go
:100644 000000 143e7dcec3... 0000000000... D	pkg/registry/securitycontextconstraints/etcd/etcd_test.go
:100644 000000 74b8535722... 0000000000... D	pkg/registry/securitycontextconstraints/registry.go
:100644 000000 4ff8e52505... 0000000000... D	pkg/registry/securitycontextconstraints/strategy.go
:100644 000000 6f873e2dc2... 0000000000... D	pkg/securitycontextconstraints/BUILD
:100644 000000 75084c2a81... 0000000000... D	pkg/securitycontextconstraints/capabilities/BUILD
:100644 000000 49e8320955... 0000000000... D	pkg/securitycontextconstraints/capabilities/mustrunas.go
:100644 000000 52a8bd015b... 0000000000... D	pkg/securitycontextconstraints/capabilities/mustrunas_test.go
:100644 000000 4b364f1968... 0000000000... D	pkg/securitycontextconstraints/capabilities/types.go
:100644 000000 c84d1a359e... 0000000000... D	pkg/securitycontextconstraints/group/BUILD
:100644 000000 ea6ea460f4... 0000000000... D	pkg/securitycontextconstraints/group/mustrunas.go
:100644 000000 7357bf45b6... 0000000000... D	pkg/securitycontextconstraints/group/mustrunas_test.go
:100644 000000 14a10b0ddb... 0000000000... D	pkg/securitycontextconstraints/group/runasany.go
:100644 000000 c4fc7873c8... 0000000000... D	pkg/securitycontextconstraints/group/runasany_test.go
:100644 000000 4a1cf7053b... 0000000000... D	pkg/securitycontextconstraints/group/types.go
:100644 000000 17b502709e... 0000000000... D	pkg/securitycontextconstraints/provider.go
:100644 000000 cdc701c2d3... 0000000000... D	pkg/securitycontextconstraints/provider_test.go
:100644 000000 cd77c377aa... 0000000000... D	pkg/securitycontextconstraints/seccomp/BUILD
:100644 000000 cd87a1b5cb... 0000000000... D	pkg/securitycontextconstraints/seccomp/types.go
:100644 000000 db514d03b8... 0000000000... D	pkg/securitycontextconstraints/seccomp/withseccomp.go
:100644 000000 fd506778b9... 0000000000... D	pkg/securitycontextconstraints/seccomp/withseccomp_test.go
:100644 000000 322958708d... 0000000000... D	pkg/securitycontextconstraints/selinux/BUILD
:100644 000000 531a17fa97... 0000000000... D	pkg/securitycontextconstraints/selinux/doc.go
:100644 000000 6c1087f744... 0000000000... D	pkg/securitycontextconstraints/selinux/mustrunas.go
:100644 000000 834d85a09c... 0000000000... D	pkg/securitycontextconstraints/selinux/mustrunas_test.go
:100644 000000 c757f43701... 0000000000... D	pkg/securitycontextconstraints/selinux/runasany.go
:100644 000000 a133d98c31... 0000000000... D	pkg/securitycontextconstraints/selinux/runasany_test.go
:100644 000000 d5c9e85572... 0000000000... D	pkg/securitycontextconstraints/selinux/types.go
:100644 000000 a1198864a8... 0000000000... D	pkg/securitycontextconstraints/types.go
:100644 000000 fe6f614943... 0000000000... D	pkg/securitycontextconstraints/user/BUILD
:100644 000000 a2c4f3ba60... 0000000000... D	pkg/securitycontextconstraints/user/doc.go
:100644 000000 831421bdf9... 0000000000... D	pkg/securitycontextconstraints/user/mustrunas.go
:100644 000000 afb923fcfe... 0000000000... D	pkg/securitycontextconstraints/user/mustrunas_test.go
:100644 000000 7215172883... 0000000000... D	pkg/securitycontextconstraints/user/mustrunasrange.go
:100644 000000 276631ec0d... 0000000000... D	pkg/securitycontextconstraints/user/nonroot.go
:100644 000000 91fb2fcdf8... 0000000000... D	pkg/securitycontextconstraints/user/nonroot_test.go
:100644 000000 b1715a5bcc... 0000000000... D	pkg/securitycontextconstraints/user/runasany.go
:100644 000000 4ed7a8581f... 0000000000... D	pkg/securitycontextconstraints/user/runasany_test.go
:100644 000000 a5ad53eb95... 0000000000... D	pkg/securitycontextconstraints/user/types.go
:100644 000000 fc7f622f42... 0000000000... D	pkg/securitycontextconstraints/user/util.go
:100644 000000 a898eae262... 0000000000... D	pkg/securitycontextconstraints/util/BUILD
:100644 000000 1ad12f5ae5... 0000000000... D	pkg/securitycontextconstraints/util/util.go
:100644 000000 54109600dd... 0000000000... D	pkg/securitycontextconstraints/util/util_test.go
:100644 100644 28d98f08b3... 8b13789179... M	api/swagger-spec/autoscaling_v2alpha1.json
:100644 100644 1813cd960e... f69c221526... M	api/swagger-spec/v1.json
:100644 100644 0a90ea1b83... 5c9cceff74... M	cmd/kube-apiserver/app/BUILD
:100644 100644 48ca69bfd6... fc1eee8ec9... M	federation/apis/federation/v1beta1/BUILD
:100644 100644 351cc9f9e0... 315956e9e8... M	pkg/api/v1/BUILD
:100644 100644 9445ef6aef... a3f7dc81fc... M	pkg/api/v1/generated.pb.go
:100644 100644 9bb6893574... 19b7ef5718... M	pkg/api/v1/generated.proto
:100644 100644 3e19802cad... 0833b92115... M	pkg/api/v1/pod/BUILD
:100644 100644 29bf07c6b5... 76b828387b... M	pkg/api/v1/types_swagger_doc_generated.go
:100644 100644 79788b6542... 94268f7c0f... M	pkg/api/v1/zz_generated.conversion.go
:100644 100644 0c15fad278... d890f13222... M	pkg/api/v1/zz_generated.deepcopy.go
:100644 100644 f6b1e7a6d4... 12c7a66112... M	pkg/api/zz_generated.deepcopy.go
:100644 100644 9c4dd6d11b... a1e7ffebec... M	pkg/apis/apps/v1beta1/BUILD
:100644 100644 d853556943... 387b663e3f... M	pkg/apis/authentication/v1beta1/BUILD
:100644 100644 4ad249d585... 9489b9fcba... M	pkg/apis/authorization/v1/BUILD
:100644 100644 4ad249d585... 9489b9fcba... M	pkg/apis/authorization/v1beta1/BUILD
:100644 100644 c29d975262... a3c2ba1d4c... M	pkg/apis/autoscaling/v1/BUILD
:100644 100644 98d475a295... 8d023952a4... M	pkg/apis/autoscaling/v2alpha1/BUILD
:100644 100644 5637d0c379... 252b82553f... M	pkg/apis/batch/v1/BUILD
:100644 100644 5381d008dd... 03ae8b9518... M	pkg/apis/batch/v2alpha1/BUILD
:100644 100644 345ced162d... 828cbd353a... M	pkg/apis/certificates/v1beta1/BUILD
:100644 100644 b1024ddcf0... 446d4be33d... M	pkg/apis/extensions/BUILD
:100644 100644 fb58592ca1... 1e3a9e16bf... M	pkg/apis/extensions/v1beta1/BUILD
:100644 100644 587615590e... 915c0ac0de... M	pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go
:100644 100644 4d8a137a2f... 6f6ae3975b... M	pkg/apis/imagepolicy/v1alpha1/BUILD
:100644 100644 47990f1c8d... 4cd6ecb3c0... M	pkg/apis/policy/v1beta1/BUILD
:100644 100644 e7534657f6... 803d440b27... M	pkg/apis/rbac/v1alpha1/BUILD
:100644 100644 9794c8ae4d... aa6fa77666... M	pkg/apis/rbac/v1beta1/BUILD
:100644 100644 5d325ea33c... 2021108f71... M	pkg/apis/storage/v1beta1/BUILD
:100644 100644 cc38787ede... bbac9ef302... M	pkg/client/clientset_generated/clientset/typed/core/v1/BUILD
:100644 100644 beb7541b2b... 6fdcaf128c... M	pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go
:100644 100644 6f4920897d... 91ad57e5df... M	pkg/client/clientset_generated/clientset/typed/core/v1/fake/BUILD
:100644 100644 702d41857f... 262bfa1d02... M	pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_core_client.go
:100644 000000 5618cfeca9... 0000000000... D	pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_securitycontextconstraints.go
:100644 100644 a9753de2e1... 5fe0585b41... M	pkg/client/clientset_generated/clientset/typed/core/v1/generated_expansion.go
:100644 000000 925f291e15... 0000000000... D	pkg/client/clientset_generated/clientset/typed/core/v1/securitycontextconstraints.go
:100644 100644 1d93fee8ac... 1aaf08d8d9... M	pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD
:100644 100644 9c4b99c121... 10313c3cb6... M	pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go
:100644 100644 3cfecdabe3... adb98de16d... M	pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD
:100644 100644 d541de05b4... 511cb36dbd... M	pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go
:100644 000000 9ea7125044... 0000000000... D	pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_securitycontextconstraints.go
:100644 100644 f5447d8a72... 6591a3af0d... M	pkg/client/clientset_generated/internalclientset/typed/core/internalversion/generated_expansion.go
:100644 000000 2c92704fbd... 0000000000... D	pkg/client/clientset_generated/internalclientset/typed/core/internalversion/securitycontextconstraints.go
:100644 100644 802a8ae127... f6a5c97b0e... M	pkg/client/informers/informers_generated/externalversions/core/v1/BUILD
:100644 100644 b26fe0be10... eb385f24f8... M	pkg/client/informers/informers_generated/externalversions/core/v1/interface.go
:100644 000000 7161c8d676... 0000000000... D	pkg/client/informers/informers_generated/externalversions/core/v1/securitycontextconstraints.go
:100644 100644 a8fe337367... a1b7344d6f... M	pkg/client/informers/informers_generated/externalversions/generic.go
:100644 100644 7fb4fb8817... f607142fe5... M	pkg/client/informers/informers_generated/internalversion/core/internalversion/BUILD
:100644 100644 d5efd66eba... a9f5f16335... M	pkg/client/informers/informers_generated/internalversion/core/internalversion/interface.go
:100644 000000 4f47032640... 0000000000... D	pkg/client/informers/informers_generated/internalversion/core/internalversion/securitycontextconstraints.go
:100644 100644 bf9db878c1... f12c17b5bd... M	pkg/client/informers/informers_generated/internalversion/generic.go
:100644 100644 214274595e... ad9aa87e52... M	pkg/client/listers/core/internalversion/BUILD
:100644 100644 9af58b8166... 5746415137... M	pkg/client/listers/core/internalversion/expansion_generated.go
:100644 000000 d029a95d7a... 0000000000... D	pkg/client/listers/core/internalversion/securitycontextconstraints.go
:100644 100644 39332352e4... 1b077a6daf... M	pkg/client/listers/core/v1/BUILD
:100644 100644 5019152765... 9b7fad0a56... M	pkg/client/listers/core/v1/expansion_generated.go
:100644 000000 c00860d2ea... 0000000000... D	pkg/client/listers/core/v1/securitycontextconstraints.go
:100644 100644 0cc537dcd0... 4c31301f9b... M	pkg/cloudprovider/providers/openstack/BUILD
:100644 100644 ee01ace1bb... 88b0cbbc1b... M	pkg/controller/garbagecollector/metaonly/BUILD
:100644 100644 5f5a1cc5f8... 62f21c7cb8... M	pkg/controller/namespace/deletion/BUILD
:100644 100644 01658bd9b3... fada996143... M	pkg/controller/volume/attachdetach/BUILD
:100644 100644 1ebeaca4d8... 32afe86619... M	pkg/controller/volume/attachdetach/populator/BUILD
:100644 100644 39c39359ba... c2b1cf8f1f... M	pkg/controller/volume/attachdetach/util/BUILD
:100644 100644 be3c6aebf2... 6b44919ac2... M	pkg/generated/openapi/zz_generated.openapi.go
:100644 100644 643a947fc9... 59d2d7db28... M	pkg/kubeapiserver/admission/BUILD
:100644 100644 644cc23c96... 0dcc176a29... M	pkg/kubelet/kuberuntime/BUILD
:100644 100644 7124d3b2d2... a73b968f96... M	pkg/kubelet/volumemanager/BUILD
:100644 100644 76d718c68d... 00ab62cd8f... M	pkg/kubelet/volumemanager/reconciler/BUILD
:100644 100644 8ef3e53576... 1e6898b6fe... M	pkg/master/BUILD
:100644 100644 acbd1df443... 9e09ebc3a6... M	pkg/master/thirdparty/BUILD
:100644 100644 943a3c4ae4... bcbce5d01d... M	pkg/registry/cachesize/BUILD
:100644 100644 da69f865d1... 6ef295553e... M	pkg/registry/core/rest/BUILD
:100644 100644 479e572e80... 3999a54d63... M	pkg/registry/extensions/rest/BUILD
:100644 100644 7015153549... ebbc3cc23e... M	pkg/util/iptables/BUILD
:100644 100644 eb5e1d20e2... 59c60a1b33... M	pkg/volume/cinder/BUILD
:100644 100644 3b7352d4e8... 0530a1f32f... M	plugin/pkg/admission/gc/BUILD
:100644 100644 83e172d69c... 52dc9cc1c8... M	plugin/pkg/admission/resourcequota/BUILD
:100644 100644 cb2cdb5400... 742d5b6b62... M	staging/src/k8s.io/apimachinery/Godeps/Godeps.json
:100644 100644 bacd010ccd... f05f4265e6... M	staging/src/k8s.io/apiserver/Godeps/Godeps.json
:100644 100644 acc6a00c68... 148b92963f... M	staging/src/k8s.io/apiserver/pkg/endpoints/BUILD
:100644 100644 a34638a7a8... a7403fd473... M	staging/src/k8s.io/apiserver/pkg/endpoints/discovery/BUILD
:100644 100644 05f0253444... a7403fd473... M	staging/src/k8s.io/apiserver/pkg/endpoints/handlers/BUILD
:100644 100644 337a10ec0a... b1e0020c09... M	staging/src/k8s.io/apiserver/pkg/server/BUILD
:100644 100644 df0b52ec11... a7403fd473... M	staging/src/k8s.io/apiserver/pkg/server/mux/BUILD
:100644 100644 ce6df23f97... a7403fd473... M	staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/BUILD
:100644 100644 ac11467428... a661d41e0c... M	staging/src/k8s.io/apiserver/pkg/storage/value/BUILD
:100644 100644 401c570ba9... a7403fd473... M	staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/aes/BUILD
:100644 100644 3043fe2065... a7403fd473... M	staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/identity/BUILD
:100644 100644 0ca9f30897... a7403fd473... M	staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/BUILD
:100644 100644 81c2b19a6b... 5f2ff96b2c... M	staging/src/k8s.io/client-go/informers/core/v1/interface.go
:100644 000000 39d335929b... 0000000000... D	staging/src/k8s.io/client-go/informers/core/v1/securitycontextconstraints.go
:100644 100644 ed1158f4bd... f20c036adf... M	staging/src/k8s.io/client-go/informers/generic.go
:100644 100644 86c7999fac... 0972960d10... M	staging/src/k8s.io/client-go/kubernetes/typed/core/v1/core_client.go
:100644 100644 e5cfd19b68... 0956b4c63c... M	staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_core_client.go
:100644 000000 14abfc3b67... 0000000000... D	staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_securitycontextconstraints.go
:100644 100644 a9753de2e1... 5fe0585b41... M	staging/src/k8s.io/client-go/kubernetes/typed/core/v1/generated_expansion.go
:100644 000000 7ee1a4af5f... 0000000000... D	staging/src/k8s.io/client-go/kubernetes/typed/core/v1/securitycontextconstraints.go
:100644 100644 5019152765... 9b7fad0a56... M	staging/src/k8s.io/client-go/listers/core/v1/expansion_generated.go
:100644 000000 b61f954533... 0000000000... D	staging/src/k8s.io/client-go/listers/core/v1/securitycontextconstraints.go
:100644 100644 2f9edf4f6c... 9970b63121... M	staging/src/k8s.io/client-go/pkg/api/register.go
:100644 100644 036ad538bb... cc46e4f25f... M	staging/src/k8s.io/client-go/pkg/api/types.go
:100644 100644 da8cfd86b7... aaa9fc5cdf... M	staging/src/k8s.io/client-go/pkg/api/v1/conversion.go
:100644 100644 fca4ba417a... 8a3833d633... M	staging/src/k8s.io/client-go/pkg/api/v1/defaults.go
:100644 100644 ccdb0a9017... 2bb1614fd9... M	staging/src/k8s.io/client-go/pkg/api/v1/generated.pb.go
:100644 100644 9bb6893574... 19b7ef5718... M	staging/src/k8s.io/client-go/pkg/api/v1/generated.proto
:100644 100644 01f4ef4706... 82d086de89... M	staging/src/k8s.io/client-go/pkg/api/v1/helpers.go
:100644 100644 ba1ec882e9... 5c2dfddd11... M	staging/src/k8s.io/client-go/pkg/api/v1/register.go
:100644 100644 2d780a09ce... 8a3a8d30ba... M	staging/src/k8s.io/client-go/pkg/api/v1/types.go
:100644 100644 29bf07c6b5... 76b828387b... M	staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go
:100644 100644 17a814bf87... 7848cf3007... M	staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.conversion.go
:100644 100644 0c15fad278... c5ad9233b0... M	staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go
:100644 100644 f6b1e7a6d4... 6f9942cd21... M	staging/src/k8s.io/client-go/pkg/api/zz_generated.deepcopy.go
:100644 100644 903e622541... 2bbd414ad2... M	staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go
:100644 100644 727fe25dda... 19ccebdaaa... M	staging/src/k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go
:100644 100644 391bd75cb0... 07047c2b06... M	staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go
:100644 100644 e3b184eef6... 8639502a97... M	staging/src/k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go
:100644 100644 94cd33e41c... 5e31d5964b... M	staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go
:100644 100644 214b59797f... 6e75ecdc09... M	staging/src/k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go
:100644 100644 587615590e... 915c0ac0de... M	staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go
:100644 100644 37232676a6... 18ec198123... M	staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go
:100644 100644 ba8317d6b3... 93409cb610... M	staging/src/k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go
:100644 000000 52504181e7... 0000000000... D	staging/src/k8s.io/client-go/pkg/securitycontextconstraints/util/util.go
:100644 100644 bb2d402713... 3f3bb7e937... M	staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
:100644 100644 0e694f197d... 2bde513471... M	staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/generated.pb.go
:000000 100644 0000000000... 2d6974cf21... A	staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/zz_generated.deepcopy.go
:100644 100644 b7eeacb0ce... a7403fd473... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/BUILD
:100644 100644 d3b9263506... a7403fd473... M	staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister/BUILD
:100644 100644 9367345299... a7403fd473... M	staging/src/k8s.io/kube-aggregator/pkg/controllers/status/BUILD
:100644 100644 e82f9e919e... a7403fd473... M	staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd/BUILD
:100644 100644 6cfbc5bd23... 571011836e... M	staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json
:100644 100644 aefd34797a... ea9c8a71de... M	test/e2e/BUILD
:100644 100644 cb047ec187... 5f21c048a7... M	test/e2e/framework/BUILD
:100644 100644 74e050070a... f17b93ce9e... M	test/e2e_federation/framework/BUILD
:100644 100644 29ebffe021... 5c9d4d81b1... M	cmd/libs/go2idl/client-gen/generators/client_generator.go
:100644 100644 5c9d4d81b1... 0826f688bb... M	cmd/libs/go2idl/client-gen/generators/client_generator.go
:100644 100644 406f8d15d0... 96c5a9136b... M	test/e2e/framework/authorizer_util.go
:100644 100644 ca12b17309... 7be99adcd2... M	pkg/kubelet/kuberuntime/kuberuntime_container.go
@liggitt
Copy link

liggitt commented Jun 27, 2017

LGTM

@deads2k deads2k merged commit 314edd5 into openshift:openshift-1.6-20170501 Jun 27, 2017
@deads2k deads2k deleted the move-upstream-04 branch August 3, 2017 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants