Skip to content

Commit

Permalink
Preparation for 3.2.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
christiangalsterer committed Jan 14, 2017
1 parent 7c52165 commit e8b5e2f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions beater/poller.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,10 @@ func mergeMaps(first map[string]interface{}, second map[string]interface{}, key

func convertTLSConfig(config *transport.TLSConfig) *tls.Config {
return &tls.Config{
Certificates: config.Certificates,
CipherSuites: config.CipherSuites,
RootCAs: config.RootCAs,
CurvePreferences: config.CurvePreferences,
Certificates: config.Certificates,
CipherSuites: config.CipherSuites,
RootCAs: config.RootCAs,
CurvePreferences: config.CurvePreferences,
InsecureSkipVerify: config.Verification != transport.VerifyFull,
}
}
Expand Down

0 comments on commit e8b5e2f

Please sign in to comment.