summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-17 18:04:29 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-17 18:04:29 +0200
commit3c97aea3e7cceaa5f212e72bfade28883685d21b (patch)
treee46fa4ebea09afb99cafac0797cec274baed3e87 /CHANGELOG
parent27af59cc3cb57ded15edc0e6c2b9ecc644790e67 (diff)
parent1bfa3fda1d466e1ef97c3e4106b8b3d7fbe5f020 (diff)
downloadgitlab-shell-3c97aea3e7cceaa5f212e72bfade28883685d21b.tar.gz
Merge branch 'batch-add-keys-timeout'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 90bd21d..56917cf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
v2.6.4
- Remove keys from authorized_keys in-place
+ - Increase batch_add_keys lock timeout to 300 seconds
+
v2.6.3
- Prevent keys with a very specific comment from accidentally being deleted.