Merge branch 'remove_reaping_frequency' into 'master'

Remove reaping frequency

Merge branch 'remove_reaping_frequency' into 'master'
Remove reaping frequency
Dmitriy Zaporozhets
2 parents d8ed8990 5163a8fc
Showing 2 changed files with 1 additions and 1 deletions Show diff stats
CHANGELOG
config/database.yml.mysql
@@ -9,6 +9,7 @@ v 6.8.0
   - Changed permission of gitlab-satellites directory not to be world accessible
   - Protected branch does not allow force push
   - Fix popen bug in `rake gitlab:satellites:create`
+  - Disable connection reaping for MySQL
  
 v 6.7.3
   - Fix the merge notification email not being sent (Pierre de La Morinerie)
@@ -7,7 +7,6 @@ production:
   reconnect: false
   database: gitlabhq_production
   pool: 10
-  reaping_frequency: 10
   username: git
   password: "secure password"
   # host: localhost
...	...	@@ -9,6 +9,7 @@ v 6.8.0
9	9	- Changed permission of gitlab-satellites directory not to be world accessible
10	10	- Protected branch does not allow force push
11	11	- Fix popen bug in `rake gitlab:satellites:create`
	12	+ - Disable connection reaping for MySQL
12	13
13	14	v 6.7.3
14	15	- Fix the merge notification email not being sent (Pierre de La Morinerie)
...	...
...	...	@@ -7,7 +7,6 @@ production:
7	7	reconnect: false
8	8	database: gitlabhq_production
9	9	pool: 10
10		- reaping_frequency: 10
11	10	username: git
12	11	password: "secure password"
13	12	# host: localhost
...	...