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