Merge branch 'version_bump' into 'master'

Version bump 2.6.4 See merge request !17

Merge branch 'version_bump' into 'master'
Version bump 2.6.4 See merge request !17
c31e6165 · Dmitriy Zaporozhets · 99f07fd2 · d43ca83d · c31e6165 · c31e6165
Commit c31e6165 authored Aug 05, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

VERSION VERSION +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
 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.

--- a/VERSION
+++ b/VERSION
-2.6.3
+2.6.4