Merge pull request #37200 from lvjiangzhao/branch

Automatic merge from submit-queue

Fix wrong comment in authn.go
This commit is contained in:
Kubernetes Submit Queue 2016-11-29 07:33:18 -08:00 committed by GitHub
commit 3e5de19126

View File

@ -283,7 +283,7 @@ func newAuthenticatorFromClientCAFile(clientCAFile string) (authenticator.Reques
return x509.New(opts, x509.CommonNameUserConversion), nil
}
// newAuthenticatorFromTokenFile returns an authenticator.Request or an error
// newAuthenticatorFromKeystoneURL returns an authenticator.Request or an error
func newAuthenticatorFromKeystoneURL(keystoneURL string, keystoneCAFile string) (authenticator.Request, error) {
keystoneAuthenticator, err := keystone.NewKeystoneAuthenticator(keystoneURL, keystoneCAFile)
if err != nil {