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

add missing commits due to failed merge

Browse source
This commit is contained in:
Sasha Klizhentas 2018-01-11 18:28:04 -08:00
parent f81c712d6a
commit 78c157a4e2
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
e

@ -1 +1 @@
Subproject commit 376294d89cbf980784d443769e1ae93efff6b6fd
Subproject commit a4ff096f4eb838e03f6496768bc8364333081403

5
lib/auth/init.go
View file

@ -374,6 +374,11 @@ func migrateLegacyResources(cfg InitConfig, asrv *AuthServer) error {
return trace.Wrap(err)
}
err = migrateTrustedClusters(asrv)
if err != nil {
return trace.Wrap(err)
}
return nil
}