k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						d0b887e4e0 
					 
					
						
						
							
							Merge pull request  #24595  from zhouhaibing089/httpserverclose  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Uncomment the code that caused by #19254 
Fix https://github.com/kubernetes/kubernetes/issues/24546 .
@lavalamp 
						
						
					 
					
						2016-04-28 01:41:16 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								deads2k 
							
						 
					 
					
						
						
							
						
						b4ebfd47c5 
					 
					
						
						
							
							add user.Info.GetExtra  
						
						 
						
						
						
						
					 
					
						2016-04-26 15:08:34 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zhouhaibing089 
							
						 
					 
					
						
						
							
						
						bf1a3f99c0 
					 
					
						
						
							
							Uncomment the code that cause by  #19254  
						
						 
						
						
						
						
					 
					
						2016-04-25 23:21:31 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris 
							
						 
					 
					
						
						
							
						
						e664ef922f 
					 
					
						
						
							
							Move restclient to its own package  
						
						 
						
						
						
						
					 
					
						2016-02-29 12:05:13 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						184440f8ef 
					 
					
						
						
							
							rename release_1_2 to internalclientset  
						
						 
						
						
						
						
					 
					
						2016-02-05 14:02:28 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						1b047f8e67 
					 
					
						
						
							
							rename legacy to core  
						
						 
						
						
						
						
					 
					
						2016-02-04 14:26:56 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nikhil Jindal 
							
						 
					 
					
						
						
							
						
						59820827d4 
					 
					
						
						
							
							Merge pull request  #20513  from nikhiljindal/apiserverExampleTest  
						
						 
						
						... 
						
						
						
						Adding test for apiserver example 
						
						
					 
					
						2016-02-04 11:28:58 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nikhiljindal 
							
						 
					 
					
						
						
							
						
						c7beb9078c 
					 
					
						
						
							
							Updating methods to return error rather than using glog.Fatalf  
						
						 
						
						
						
						
					 
					
						2016-02-03 16:00:45 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						f9f5736b01 
					 
					
						
						
							
							grep sed  
						
						 
						
						
						
						
					 
					
						2016-02-03 13:06:07 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						cddd7b56a4 
					 
					
						
						
							
							replace client with clientset in kubelet and other places  
						
						 
						
						
						
						
					 
					
						2016-02-02 20:28:45 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						fe7887f1ec 
					 
					
						
						
							
							replace the client with clientset in controllers  
						
						 
						
						
						
						
					 
					
						2016-02-02 20:28:45 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clayton Coleman 
							
						 
					 
					
						
						
							
						
						38c7eded99 
					 
					
						
						
							
							Prepare for content-type negotiation  
						
						 
						
						... 
						
						
						
						Combine the fields that will be used for content transformation
(content-type, codec, and group version) into a single struct in client,
and then pass that struct into the rest client and request. Set the
content-type when sending requests to the server, and accept the content
type as primary.
Will form the foundation for content-negotiation via the client. 
						
						
					 
					
						2016-01-26 17:44:30 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Oppenheimer 
							
						 
					 
					
						
						
							
						
						8ac484793d 
					 
					
						
						
							
							Comment out calls to httptest.Server.Close() to work around  
						
						 
						
						... 
						
						
						
						https://github.com/golang/go/issues/12262  . See #19254  for
more details. This change should be reverted when we upgrade
to Go 1.6. 
						
						
					 
					
						2016-01-11 23:02:11 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clayton Coleman 
							
						 
					 
					
						
						
							
						
						9dad7e624c 
					 
					
						
						
							
							Split the serviceaccount package into two parts  
						
						 
						
						... 
						
						
						
						Public utility methods and JWT parsing, and controller specific logic.
Also remove the coupling between ServiceAccountTokenGetter and the
authenticator class. 
						
						
					 
					
						2015-12-26 21:28:12 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wojciech Tyczynski 
							
						 
					 
					
						
						
							
						
						960808bf08 
					 
					
						
						
							
							Switch to versioned ListOptions in client.  
						
						 
						
						
						
						
					 
					
						2015-12-14 14:26:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wojciech Tyczynski 
							
						 
					 
					
						
						
							
						
						6dcb689d4e 
					 
					
						
						
							
							Simplify List() signature in clients.  
						
						 
						
						
						
						
					 
					
						2015-12-03 09:54:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nikhiljindal 
							
						 
					 
					
						
						
							
						
						41ebe6f1a3 
					 
					
						
						
							
							Cleaning up duplicate master config inits  
						
						 
						
						
						
						
					 
					
						2015-12-02 15:03:22 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						689586c6ae 
					 
					
						
						
							
							Merge pull request  #16153  from gmarek/use_api_ports  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2015-12-02 05:57:49 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gmarek 
							
						 
					 
					
						
						
							
						
						459131fd92 
					 
					
						
						
							
							Use KubeletPort reported in NodeStatus instead of cluster-wide master config, take 2.  
						
						 
						
						
						
						
					 
					
						2015-12-02 13:38:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wojciech Tyczynski 
							
						 
					 
					
						
						
							
						
						8343c8ce6c 
					 
					
						
						
							
							Pass ListOptions to List() methods.  
						
						 
						
						
						
						
					 
					
						2015-12-01 15:00:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								deads2k 
							
						 
					 
					
						
						
							
						
						a87d927588 
					 
					
						
						
							
							update client.Config to use GroupVersion  
						
						 
						
						
						
						
					 
					
						2015-11-21 08:29:26 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nikhiljindal 
							
						 
					 
					
						
						
							
						
						a0c038982e 
					 
					
						
						
							
							Fixing integrations test  
						
						 
						
						
						
						
					 
					
						2015-10-15 16:54:17 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wojciech Tyczynski 
							
						 
					 
					
						
						
							
						
						0f1cbe37a4 
					 
					
						
						
							
							Events in separate etcd  
						
						 
						
						
						
						
					 
					
						2015-10-05 10:54:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brendan Burns 
							
						 
					 
					
						
						
							
						
						ec427f22b1 
					 
					
						
						
							
							Disable race detection for all integration tests  
						
						 
						
						
						
						
					 
					
						2015-09-24 09:37:01 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brendan Burns 
							
						 
					 
					
						
						
							
						
						d3379e72be 
					 
					
						
						
							
							Turn off race detection in the etcd tools test as etcd client isn't thread safe  
						
						 
						
						
						
						
					 
					
						2015-09-23 21:25:26 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						1278771b34 
					 
					
						
						
							
							let apiserver support api discovery  
						
						 
						
						
						
						
					 
					
						2015-09-21 12:20:24 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						dd6c121d7f 
					 
					
						
						
							
							massive changes  
						
						 
						
						
						
						
					 
					
						2015-09-11 17:31:47 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tummychow 
							
						 
					 
					
						
						
							
						
						78ce5da988 
					 
					
						
						
							
							Move util.StringSet into its own package  
						
						 
						
						... 
						
						
						
						A lot of packages use StringSet, but they don't use anything else from
the util package. Moving StringSet into another package will shrink
their dependency trees significantly. 
						
						
					 
					
						2015-09-10 12:04:15 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						9fc79e9d99 
					 
					
						
						
							
							refactor testapi and test scripts to prepare for multiple API groups.  
						
						 
						
						
						
						
					 
					
						2015-09-04 18:01:32 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris Rousey 
							
						 
					 
					
						
						
							
						
						ae6c64d9bb 
					 
					
						
						
							
							Moving everyone to unversioned client  
						
						 
						
						
						
						
					 
					
						2015-08-18 10:23:03 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Danese 
							
						 
					 
					
						
						
							
						
						8e33cbfa28 
					 
					
						
						
							
							rewrite go imports  
						
						 
						
						
						
						
					 
					
						2015-08-05 17:30:03 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gmarek 
							
						 
					 
					
						
						
							
						
						d27ad5b714 
					 
					
						
						
							
							Controller codebase refactoring  
						
						 
						
						
						
						
					 
					
						2015-08-03 17:06:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Muhammed Uluyol 
							
						 
					 
					
						
						
							
						
						58a875ac2c 
					 
					
						
						
							
							Add (stopgap) support for an experimental API prefix.  
						
						 
						
						
						
						
					 
					
						2015-07-30 18:14:29 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wojciech Tyczynski 
							
						 
					 
					
						
						
							
						
						9d943df397 
					 
					
						
						
							
							Private EtcdHelper  
						
						 
						
						
						
						
					 
					
						2015-07-27 09:20:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Hockin 
							
						 
					 
					
						
						
							
						
						1c3233a1d4 
					 
					
						
						
							
							Remove v1beta3  
						
						 
						
						
						
						
					 
					
						2015-07-23 17:21:27 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nikhiljindal 
							
						 
					 
					
						
						
							
						
						c465a50891 
					 
					
						
						
							
							Stop exposing v1beta3 by default  
						
						 
						
						
						
						
					 
					
						2015-07-08 15:27:41 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Danese 
							
						 
					 
					
						
						
							
						
						56bde3342a 
					 
					
						
						
							
							add ca to token controller and all service accounts  
						
						 
						
						
						
						
					 
					
						2015-06-24 15:10:20 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Danese 
							
						 
					 
					
						
						
							
						
						44d5815663 
					 
					
						
						
							
							fix broken integration tests  
						
						 
						
						
						
						
					 
					
						2015-06-19 10:57:46 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						ef61b031f5 
					 
					
						
						
							
							make v1 enabled by default  
						
						 
						
						
						
						
					 
					
						2015-06-04 11:37:44 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						89c8949e78 
					 
					
						
						
							
							add v1 to hack/test-integration.sh  
						
						 
						
						
						
						
					 
					
						2015-06-02 14:55:45 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clayton Coleman 
							
						 
					 
					
						
						
							
						
						3b10d82864 
					 
					
						
						
							
							Merge pull request  #8391  from liggitt/etcd_token_lookup  
						
						 
						
						... 
						
						
						
						Make serviceaccount/token lookup more flexible 
						
						
					 
					
						2015-05-18 11:08:30 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jordan Liggitt 
							
						 
					 
					
						
						
							
						
						d90e7409e4 
					 
					
						
						
							
							Prevent auth recursion for service account tokens  
						
						 
						
						
						
						
					 
					
						2015-05-16 23:39:07 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jordan Liggitt 
							
						 
					 
					
						
						
							
						
						7e9281fc39 
					 
					
						
						
							
							Allow ServiceAccountsController to manage multiple named service accounts  
						
						 
						
						
						
						
					 
					
						2015-05-15 23:42:00 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jordan Liggitt 
							
						 
					 
					
						
						
							
						
						92bd58ede6 
					 
					
						
						
							
							ServiceAccount e2e/integration tests  
						
						 
						
						
						
						
					 
					
						2015-05-11 17:18:06 -04:00