Merge branch '6-9-stable' into 6-9-stable-ee

Jacob Vosmaer
2 parents 5b51d8b4 b3f6b793
Showing 1 changed file with 6 additions and 0 deletions Show diff stats
README.md
@@ -139,12 +139,18 @@ sudo gitlab-ctl stop
 sudo gitlab-ctl restart
 ```
  
+Note that on a single-core server it may take up to a minute to restart Unicorn
+and Sidekiq. Your GitLab instance will give a 502 error until Unicorn is up
+again.
+
 It is also possible to start, stop or restart individual components.
  
 ```shell
 sudo gitlab-ctl restart unicorn
 ```
  
+Note that you cannot use a Unicorn reload to update the Ruby runtime.
+
 ## Configuration
  
 ### Creating the gitlab.rb configuration file
...	...	@@ -139,12 +139,18 @@ sudo gitlab-ctl stop
139	139	sudo gitlab-ctl restart
140	140	```
141	141
	142	+Note that on a single-core server it may take up to a minute to restart Unicorn
	143	+and Sidekiq. Your GitLab instance will give a 502 error until Unicorn is up
	144	+again.
	145	+
142	146	It is also possible to start, stop or restart individual components.
143	147
144	148	```shell
145	149	sudo gitlab-ctl restart unicorn
146	150	```
147	151
	152	+Note that you cannot use a Unicorn reload to update the Ruby runtime.
	153	+
148	154	## Configuration
149	155
150	156	### Creating the gitlab.rb configuration file
...	...