Merge 'v1.5.0-rc2' into master

This commit is contained in:
Fernandez Ludovic 2017-12-06 20:24:46 +01:00
commit 260ee980e0
8 changed files with 119 additions and 40 deletions

View file

@ -374,6 +374,7 @@ func (s *Server) preLoadConfiguration(configMsg types.ConfigMessage) {
// it will publish the last of the newly received configurations.
func throttleProviderConfigReload(throttle time.Duration, publish chan<- types.ConfigMessage, in <-chan types.ConfigMessage, stop chan bool) {
ring := channels.NewRingChannel(1)
defer ring.Close()
safe.Go(func() {
for {