diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 18:06:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 18:06:33 +0300 |
| commit | 90a06a20be61bb6d48d77746091492831153e075 (patch) | |
| tree | bdba99289605f8b5acf12159d02aeb23f8690202 /spec/lib/gitlab/cluster | |
| parent | 84a0e65ac88c7a3db86a0e4347606ba093490bef (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/cluster')
| -rw-r--r-- | spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb b/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb index 293df4ffed7..b8ac8c5b95c 100644 --- a/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb +++ b/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb @@ -77,7 +77,7 @@ describe Gitlab::Cluster::Mixins::PumaCluster do mutex = Mutex.new - Gitlab::Cluster::LifecycleEvents.on_before_graceful_shutdown do + Gitlab::Cluster::LifecycleEvents.on_before_blackout_period do mutex.synchronize do exit(140) end diff --git a/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb b/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb index 7fa80c14bdc..ebe019924d5 100644 --- a/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb +++ b/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb @@ -75,7 +75,7 @@ describe Gitlab::Cluster::Mixins::UnicornHttpServer do mutex = Mutex.new - Gitlab::Cluster::LifecycleEvents.on_before_graceful_shutdown do + Gitlab::Cluster::LifecycleEvents.on_before_blackout_period do mutex.synchronize do exit(140) end |