Tom Denham c55b98bd6a Merge branch 'master' into fix %!s(int64=8) %!d(string=hai) anos
..
etcdv2 01afb49e72 Remove the experimental support for multiple networks. %!s(int64=8) %!d(string=hai) anos
kube c55b98bd6a Merge branch 'master' into fix %!s(int64=8) %!d(string=hai) anos
config.go befe8799db Fix various little problems found by gometalinter %!s(int64=8) %!d(string=hai) anos
config_test.go cdb519c3ce Change copyright from CoreOS to flannel authors %!s(int64=9) %!d(string=hai) anos
subnet.go 01afb49e72 Remove the experimental support for multiple networks. %!s(int64=8) %!d(string=hai) anos
watch.go 01afb49e72 Remove the experimental support for multiple networks. %!s(int64=8) %!d(string=hai) anos