From 78c157a4e28a324aa516eab0c2674a7dd603ea9d Mon Sep 17 00:00:00 2001
From: Sasha Klizhentas <klizhentas@gmail.com>
Date: Thu, 11 Jan 2018 18:28:04 -0800
Subject: [PATCH] add missing commits due to failed merge

---
 e                | 2 +-
 lib/auth/init.go | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/e b/e
index 376294d89cb..a4ff096f4eb 160000
--- a/e
+++ b/e
@@ -1 +1 @@
-Subproject commit 376294d89cbf980784d443769e1ae93efff6b6fd
+Subproject commit a4ff096f4eb838e03f6496768bc8364333081403
diff --git a/lib/auth/init.go b/lib/auth/init.go
index 3da9e4112d8..da439a633e0 100644
--- a/lib/auth/init.go
+++ b/lib/auth/init.go
@@ -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
 }