k8s-merge-robot 076bf81b8b Merge pull request #23473 from AdoHe/kubelet_tls_overwrite ... Automatic merge from submit-queue fix kubelet tls overwrite issue @lavalamp apply the same thing to kubelet. @dchen1107 ptal. <!-- Reviewable:start --> --- This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/23473) <!-- Reviewable:end -->		2016-06-17 23:20:03 -07:00
..
options	pkg/master: enable certificates API and add rbac authorizer	2016-05-25 14:24:47 -07:00
default_storage_factory_builder.go	Moving StorageFactory building logic to genericapiserver	2016-05-10 00:57:11 -07:00
default_storage_factory_builder_test.go	Moving StorageFactory building logic to genericapiserver	2016-05-10 00:57:11 -07:00
doc.go	Extracting APIServer machinery code into a library	2015-12-16 13:54:23 -08:00
genericapiserver.go	Merge pull request #23473 from AdoHe/kubelet_tls_overwrite	2016-06-17 23:20:03 -07:00
genericapiserver_test.go	followup to add http server close method	2016-05-05 12:04:41 +08:00
OWNERS	Move blunderbuss assignees into tree	2016-03-02 20:46:32 -05:00
resource_config.go	refactor resource overrides as positive logic interface	2016-03-28 09:24:49 -04:00
resource_config_test.go	refactor resource overrides as positive logic interface	2016-03-28 09:24:49 -04:00
resource_encoding_config.go	Storage, not Storgage	2016-05-05 12:08:22 -04:00
server_run_options_test.go	kube-apiserver options should be decoupled from impls	2016-05-18 10:39:21 -04:00
storage_factory.go	kube-apiserver options should be decoupled from impls	2016-05-18 10:39:21 -04:00
storage_factory_test.go	kube-apiserver options should be decoupled from impls	2016-05-18 10:39:21 -04:00
tunneler.go	Moving master.SSHTunneler to genericapiserver	2016-04-22 11:47:05 -07:00
tunneler_test.go	Moving master.SSHTunneler to genericapiserver	2016-04-22 11:47:05 -07:00