summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-03-16 10:59:21 +0100
committerJames Lopez <james@jameslopez.es>2016-03-16 10:59:21 +0100
commita82dbf294e1e1fea29da7db93f5ffa33d95f787e (patch)
tree80fe3b92579ed7077db523bdc70ddaac7de73f13
parent8ec968376b73ed634939220d7b0a3e3f2c1f9b72 (diff)
downloadgitlab-shell-a82dbf294e1e1fea29da7db93f5ffa33d95f787e.tar.gz
update changelog and version
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2862869..f2b809e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v2.6.12
+ - Fix git-annex issue not working using custom SSH port repositories
+
v2.6.11
- Increase HTTP timeout and log request durations
- Workaround for a Webrick issue on Ruby 2.2
diff --git a/VERSION b/VERSION
index bc02b86..c959dfb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.11
+2.6.12