Pick down release 1.2 stable 20160316 #14
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ditor :100644 100644 ad3f2df... 93ccdfe... M pkg/kubectl/cmd/cmd.go :100644 100644 f43a662... 723ef80... M pkg/kubectl/cmd/edit.go
Signed-off-by: Michal Minar <miminar@redhat.com> :100644 100644 c195ab3... 9536e07... M plugin/pkg/admission/resourcequota/admission.go :100644 100644 15a00b5... ffc8fa7... M plugin/pkg/admission/resourcequota/admission_test.go
:100644 100644 8a65579... 01dae4f... M pkg/apiserver/proxy_test.go :100644 100644 f1068930.. 90bd119... M pkg/client/transport/cache.go :100644 100644 8320992... b92fbaf... M pkg/cloudprovider/providers/mesos/client_test.go :100644 100644 5da1bcd... c2e275f... M pkg/credentialprovider/gcp/metadata_test.go :100644 100644 e9673b4... 9e8b0e1... M pkg/probe/http/http.go :100644 100644 5e01461... 1386c88... M pkg/registry/generic/rest/proxy_test.go :100644 100644 5edcb83... 896baf6... M pkg/storage/etcd/etcd_helper.go :100644 100644 f3d4473... a5000a8... M pkg/util/net/http.go :100644 100644 7990a51... 1de67ca... M pkg/util/net/http_test.go :100644 100644 8a54aaf... 30b403f... M plugin/pkg/scheduler/extender.go :100644 100644 41952df... 49fb3af... M test/e2e/ingress_utils.go :100644 100644 e1233a7... b3f4963... M test/e2e/kubectl.go :100644 100644 47b21c8... bf9eed7... M test/e2e/kubeproxy.go :100644 100644 11f531b... 3837026... M test/e2e/service.go
:100644 100644 d4e9916... 0f44c83... M pkg/kubelet/kubelet.go
:100644 100644 fd24f1f... 6f615b3... M pkg/apiserver/resthandler.go :100644 100644 50477fc... 1dd5bdb... M pkg/apiserver/resthandler_test.go
:100644 100644 5b487ac... 330c111... M pkg/kubectl/cmd/rollout/rollout_history.go :100644 100644 0445159... 3b8960b... M pkg/kubectl/describe.go :100644 100644 c2169b1... cab263a... M pkg/kubectl/describe_test.go
:100644 100644 5257bbc... df8282f... M api/swagger-spec/v1.json :100644 100644 fafa71d... ddaf408... M pkg/api/deep_copy_generated.go :100644 100644 ce72b0a... 7424a00... M pkg/api/types.go :100644 100644 a69793e... 756898b... M pkg/api/v1/conversion_generated.go :100644 100644 b1623d6... 99c53b9... M pkg/api/v1/deep_copy_generated.go :100644 100644 e02f7c3... 496bec1... M pkg/api/v1/types.go :100644 100644 faa5411... 56d8a5d... M pkg/api/v1/types_swagger_doc_generated.go :100644 100644 d1c7275... 42f2d16... M pkg/kubectl/cmd/exec.go :100644 100644 0445159... 10bad58... M pkg/kubectl/describe.go :100644 100644 119763b... ae92c5e... M pkg/kubectl/resource_printer.go :100644 100644 813c0aa... c07e5f9... M pkg/securitycontextconstraints/provider.go :100644 100644 145e76b... e81e204... M pkg/securitycontextconstraints/provider_test.go
:100644 100644 486c7c4... a4097e9... M pkg/api/v1beta3/conversion_generated.go :100644 100644 cc0d540... 371e00f... M pkg/api/v1beta3/deep_copy_generated.go :100644 100644 d018994... 04f1e99... M pkg/api/v1beta3/types.go
…ntainer setting for readonlyrootfs :100644 100644 9bd5b16... de6a16d... M pkg/securitycontext/provider.go
…visor This reverts commit d54ed4ecd03dc703036cbc14a62d706581ad52ce. :100644 100644 0f44c83... d4e9916... M pkg/kubelet/kubelet.go
:100644 100644 3acda3a... 4d963b2... M pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go
…tor test :100644 100644 a49afb1... 66fd7d4... M test/e2e/garbage_collector.go
:100644 100644 0c9a10b... c95889a... M pkg/client/restclient/request.go
:100644 100644 c32bb6b... b20f466... M test/e2e/resource_quota.go
:100644 100644 b39d7fd... 6f68384... M pkg/api/v1beta3/conversion.go :100644 100644 a4097e9... 57c0aeb... M pkg/api/v1beta3/conversion_generated.go :100644 100644 e0a7e4b... e9c1757... M pkg/api/v1beta3/conversion_test.go
:100644 100644 df8282f... 9e5edbe... M api/swagger-spec/v1.json :100644 100644 ddaf408... ceb00b7... M pkg/api/deep_copy_generated.go :100644 100644 2a75289... 57e0340... M pkg/api/testing/fuzzer.go :100644 100644 7424a00... 2006090... M pkg/api/types.go :100644 100644 9a5be6b... b90363f... M pkg/api/v1/conversion.go :100644 100644 756898b... d7e0a49... M pkg/api/v1/conversion_generated.go :100644 100644 99c53b9... bc6c847... M pkg/api/v1/deep_copy_generated.go :100644 100644 a8bc652... 65de8bd... M pkg/api/v1/defaults.go :100644 100644 6e97409... 6844076... M pkg/api/v1/defaults_test.go :100644 100644 496bec1... 058991f... M pkg/api/v1/types.go :100644 100644 247ffe0... e2ddd55... M pkg/kubectl/describe.go :100644 100644 ae92c5e... 500c640... M pkg/kubectl/resource_printer.go :100644 100644 c07e5f9... bd5be7a... M pkg/securitycontextconstraints/provider.go :100644 100644 e81e204... 196aaa7... M pkg/securitycontextconstraints/provider_test.go :000000 100644 0000000... d20b749... A pkg/securitycontextconstraints/util/util.go :000000 100644 0000000... 442f5b0... A pkg/securitycontextconstraints/util/util_test.go
…egacy API group :100644 100644 c2be65f... 6db1406... M pkg/genericapiserver/genericapiserver.go
…use endpoints flush during restart :100644 100644 07491f6... e19c0ce... M pkg/controller/endpoint/endpoints_controller.go :100644 100644 670824a... 6f5d43f... M pkg/controller/endpoint/endpoints_controller_test.go
…< 10m :100644 100644 08f19a7... da6ebd8... M pkg/kubelet/dockertools/docker.go :100644 100644 8fdd79d... 1a73665... M pkg/kubelet/dockertools/docker_test.go
The kubelet sync loop relies on getting one update as the signal that the specific source is ready. This change ensures that we don't send multiple updates (ADD, UPDATE) for the first batch of pods. This is required to prevent the cleanup routine from killing pods prematurely. :100644 100644 5ecf252... 0d190e0... M pkg/kubelet/config/config.go :100644 100644 0c148e3... 5bc6a11... M pkg/kubelet/config/config_test.go :100644 100644 d4e9916... 15631b5... M pkg/kubelet/kubelet.go
It will poll for operation completion with at most 10 qps to avoid triggering GCE's rate limits. :100644 100644 bf458ce... 53f89f8... M pkg/cloudprovider/providers/gce/gce.go
:100644 100644 15631b5... 661bece... M pkg/kubelet/kubelet.go
…hey can contain loops. :100644 100644 1dfcec7... 4826652... M pkg/volume/host_path/host_path.go :100644 100644 8b1f1c8... 85db396... M pkg/volume/host_path/host_path_test.go
…that match all pods :100644 100644 96c1051... 50a5293... M pkg/controller/daemon/controller.go :100644 100644 7728b4c... 861f9df... M pkg/controller/daemon/controller_test.go
:100644 100644 c95889a... 9dc19ca... M pkg/client/restclient/request.go
…on creation :100644 100644 b87bff2... 4981f96... M pkg/apis/extensions/validation/validation.go :100644 100644 e485a99... c6e9c27... M pkg/apis/extensions/validation/validation_test.go
:100644 100644 50a5293... 83e4970... M pkg/controller/daemon/controller.go :100644 100644 2c60e40... 77ed1da... M pkg/controller/deployment/deployment_controller.go :100644 100644 31cb700... 05ca469... M pkg/controller/deployment/deployment_controller_test.go
…ke 2 Reorder code a bit so it doesn't allow a case where you get some error other than "not found" combined with a non-nil Claim. Add test case. :100644 100644 4d963b2... 35e8994... M pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go :100644 100644 37ef08c... f01908c... M pkg/controller/persistentvolume/persistentvolume_claim_binder_controller_test.go
:100644 100644 0e19de5... d2a870f... M plugin/pkg/admission/namespace/lifecycle/admission.go :100644 100644 0d7c518... 4714528... M plugin/pkg/admission/namespace/lifecycle/admission_test.go
:100644 100644 78558c6... c83d103... M test/e2e/kubectl.go :100644 100644 118575b... 03438d6... M test/e2e/portforward.go
|
👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Result of
hack/move-upstream.sh master...1fd827d.I'd like this update so I can create the marker commit
bump(k8s....)in openshift.@liggitt @pweil-