summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-05 10:45:57 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-05 10:45:57 +0000
commitc31e6165016e4f12483b4c328a62493adac1bcac (patch)
tree4c4a2c2df97cd6e5cf17513571ab27984323a045
parent99f07fd2a11b9e226ee39d6018f41cf282cedf86 (diff)
parentd43ca83d404dfb070a25042a83814ee65070ead1 (diff)
downloadgitlab-shell-c31e6165016e4f12483b4c328a62493adac1bcac.tar.gz
Merge branch 'version_bump' into 'master' v2.6.4
Version bump 2.6.4 See merge request !17
-rw-r--r--CHANGELOG1
-rw-r--r--VERSION2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 56917cf..f7dc957 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
v2.6.4
- Remove keys from authorized_keys in-place
- Increase batch_add_keys lock timeout to 300 seconds
+ - If git-annex is enabled set GIT_ANNEX_SHELL_LIMITED variable
v2.6.3
- Prevent keys with a very specific comment from accidentally being deleted.
diff --git a/VERSION b/VERSION
index ec1cf33..2714f53 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.3
+2.6.4