github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/pkg/master
History
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
..
doc.go Refactor apiserver command; move logic to a package for reuse and eventual testing 2014-06-15 23:30:58 -07:00
master.go Merge branch 'master' into fix/golint 2014-07-15 20:57:47 +09:00
pod_cache.go Merge branch 'master' into fix/golint 2014-07-15 20:57:47 +09:00
pod_cache_test.go Change kublet to serve podInfo instead of containerInfo. Plumb through system. 2014-07-01 16:41:10 -07:00