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

..

config_test.go

First commit

2014-06-06 16:40:48 -07:00

config.go

Fixes golint errors in pkg/proxy

2014-07-11 22:35:57 +09:00

doc.go

Address package level comments for readability.

2014-06-12 20:26:12 -07:00

etcd_test.go

Fixes golint errors in pkg/proxy

2014-07-11 22:35:57 +09:00

etcd.go

Fixes golint errors in pkg/proxy

2014-07-11 22:35:57 +09:00

file.go

Merge branch 'master' into fix/golint

2014-07-15 20:57:47 +09:00