Merge branch 'master' of github.com:gravitational/teleport

caidongyun · Sep 25, 2016 · b277805 · b277805
2 parents f1007c2 + 20e0297
commit b277805
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/utils/cli.go b/lib/utils/cli.go
@@ -82,7 +82,7 @@ func InitLoggerForTests() {
 	log.SetOutput(ioutil.Discard)
 }
 
-// FatalError is for CLI front-ends: it detects gravitational.Trace debugging
+// FatalError is for CLI front-ends: it detects gravitational/trace debugging
 // information, sends it to the logger, strips it off and prints a clean message to stderr
 func FatalError(err error) {
 	fmt.Fprintln(os.Stderr, UserMessageFromError(err))

diff --git a/tool/tctl/main.go b/tool/tctl/main.go
@@ -716,11 +716,11 @@ func connectToAuthService(cfg *service.Config) (client *auth.TunClient, err erro
 	return client, nil
 }
 
-// validateConfig updtes&validates tctl configuration
+// validateConfig validates and updates tctl configuration
 func validateConfig(cfg *service.Config) {
 	var err error
-	// read or generate a host UUID for this node
-	cfg.HostUUID, err = utils.ReadOrMakeHostUUID(cfg.DataDir)
+	// read a host UUID for this node
+	cfg.HostUUID, err = utils.ReadHostUUID(cfg.DataDir)
 	if err != nil {
 		utils.FatalError(err)
 	}