homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/containous/master'

Browse source 
# Conflicts:
#	glide.lock
#	glide.yaml
This commit is contained in:
David Tootill 2016-04-27 09:41:51 -07:00
commit f93e618f67
33 changed files with 1622 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

3
server.go
View file

@ -236,6 +236,9 @@ func (server *Server) configureProviders() {
if server.globalConfiguration.Boltdb != nil {
server.providers = append(server.providers, server.globalConfiguration.Boltdb)
}
if server.globalConfiguration.Kubernetes != nil {
server.providers = append(server.providers, server.globalConfiguration.Kubernetes)
}
}
func (server *Server) startProviders() {