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

..

api

Update services to use the internal IP and port, now that its available.

2014-07-14 20:24:58 -07:00

apiserver

Fixes golint errors in pkg/apiserver

2014-07-08 16:10:11 +09:00

client

rename client.ClientInterface to client.Interface

2014-07-11 09:51:34 +10:00

cloudprovider

Fixes golint errors in pkg/cloudprovider

2014-07-10 20:46:56 +09:00

controller

pkg/controller: cleanup replication_controller.go

2014-07-12 14:21:51 -07:00

healthz

Address comments.

2014-07-14 20:38:43 -07:00

kubecfg

Add a template printer to kubecfg.

2014-07-14 21:13:06 -07:00

kubelet

Address comments.

2014-07-14 20:38:43 -07:00

labels

Merge branch 'master' into fix/golint

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

master

Merge branch 'master' into fix/golint

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

proxy

Merge branch 'master' into fix/golint

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

registry

Update services to use the internal IP and port, now that its available.

2014-07-14 20:24:58 -07:00

scheduler

Merge branch 'master' into fix/golint

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

tools

fix data races in controller

2014-07-02 23:22:09 -07:00

util

Fix go idiom feedback

2014-07-11 11:43:42 -07:00

version

update version package when building.

2014-07-02 15:32:30 -07:00