Merge branch 'master' into feature/diagnostic-rest-api

# Conflicts: # pkg/controller/controller.go # pkg/controller/postgresql.go
2017-07-27 14:32:19 +02:00 · 2017-07-27 14:32:19 +02:00 · ed0db7193c
parent 5db09facd5 3ad4b127c4
commit ed0db7193c
2 changed files with 2 additions and 1 deletions
--- a/pkg/controller/postgresql.go
+++ b/pkg/controller/postgresql.go
@ -238,6 +238,7 @@ func (c *Controller) processClusterEventsQueue(idx int, stopCh <-chan struct{},
 	}()

 	<-stopCh
+	c.clusterEventQueues[idx].Close()
 }

 func (c *Controller) queueClusterEvent(old, new *spec.Postgresql, eventType spec.EventType) {