diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 10:40:27 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 10:40:27 +0000 |
| commit | 0dc48fac6b68299c8043b7e03a9fac3ae2b4888c (patch) | |
| tree | b31afce8f0f7634b1ab2d3788cb03c51a5a0b15d | |
| parent | d8ed899038458f6de3709d8a2c90ec1f897df782 (diff) | |
| parent | 5163a8fcb9cfd63435560fda00173b76df2ccc93 (diff) | |
| download | gitlab-ce-0dc48fac6b68299c8043b7e03a9fac3ae2b4888c.tar.gz | |
Merge branch 'remove_reaping_frequency' into 'master'
Remove reaping frequency
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/database.yml.mysql | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index d0613c301ea..a6f2b36d31c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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) diff --git a/config/database.yml.mysql b/config/database.yml.mysql index 6943aaca45b..55ac088bc1d 100644 --- a/config/database.yml.mysql +++ b/config/database.yml.mysql @@ -7,7 +7,6 @@ production: reconnect: false database: gitlabhq_production pool: 10 - reaping_frequency: 10 username: git password: "secure password" # host: localhost |