Yuki Yugui Sonoda
							
						 
					 | 
					
						
						
							
						
						41febcee5e
					 | 
					
						
						
							
							Merge branch 'master' into fix/golint
						
						
						
						
						
						
						
						Conflicts:
	pkg/master/master.go
	pkg/master/pod_cache.go
	pkg/proxy/config/file.go
	pkg/proxy/proxier.go
	pkg/proxy/roundrobbin.go
	pkg/scheduler/randomfit.go
	pkg/scheduler/randomfit_test.go 
						
						
					 | 
					
						2014-07-15 20:57:47 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Claire Li
							
						 
					 | 
					
						
						
							
						
						2b183943c2
					 | 
					
						
						
							
							pkg/selector: set the cap for slice in SelectorFromSet
						
						
						
						
						
						
					 | 
					
						2014-07-11 22:59:50 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yuki Yugui Sonoda
							
						 
					 | 
					
						
						
							
						
						85fa11da93
					 | 
					
						
						
							
							Fixes golint errors in pkg/labels
						
						
						
						
						
						
					 | 
					
						2014-07-11 22:28:27 +09:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Burcu Dogan
							
						 
					 | 
					
						
						
							
						
						f4d989ae92
					 | 
					
						
						
							
							labels: Fixing linting errors.
						
						
						
						
						
						
					 | 
					
						2014-07-10 22:08:12 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Smith
							
						 
					 | 
					
						
						
							
						
						b3fbc47bd4
					 | 
					
						
						
							
							Make selector parsing deterministic
						
						
						
						
						
						
					 | 
					
						2014-06-20 10:03:56 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Smith
							
						 
					 | 
					
						
						
							
						
						671a7f1c27
					 | 
					
						
						
							
							File name should have changed during query->selector rename.
						
						
						
						
						
						
					 | 
					
						2014-06-20 09:58:09 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |