Merge branch 'master' into ev/standalone

This commit is contained in:
Ev Kontsevoy 2016-10-10 10:52:39 -07:00
commit 40ff1eea08
2 changed files with 2 additions and 1 deletions

1
examples/local-cluster/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
.data

View file

@ -591,7 +591,7 @@ func NewTunClient(purpose string,
if tc.addrStorage != nil {
cachedAuthServers, err := tc.addrStorage.GetAddresses()
if err != nil {
log.Warningf("unable to load the auth server cache: %v", err)
log.Infof("unable to load the auth server cache: %v", err)
} else {
tc.setAuthServers(cachedAuthServers)
}