self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-22 10:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ev/dynamo

Browse source
This commit is contained in:
Ev Kontsevoy 2016-10-27 15:01:28 -07:00 committed by GitHub
parent c10268af4d 485787cf44
commit 7debfc790f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/config/configuration.go
View file

@ -136,7 +136,7 @@ func ApplyFileConfig(fc *FileConfig, cfg *service.Config) error {
if err != nil {
return trace.Errorf("cannot parse auth server address: '%v'", as)
}
cfg.AuthServers = []utils.NetAddr{*addr}
cfg.AuthServers = append(cfg.AuthServers, *addr)
}
}
cfg.ApplyToken(fc.AuthToken)