From 9186c6413e7cdfc33527ca69d2e56dfec6d8b760 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 18:59:24 -0400
Subject: [PATCH] Merge non-fast-forward for release branch merges

---
 src/test/config/test-gitblit.properties |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/test/config/test-gitblit.properties b/src/test/config/test-gitblit.properties
index e636469..1a52eaf 100644
--- a/src/test/config/test-gitblit.properties
+++ b/src/test/config/test-gitblit.properties
@@ -7,6 +7,8 @@
 git.searchRepositoriesSubfolders = true
 git.enableGitServlet = true
 git.daemonPort = 8300
+git.sshPort = 29418
+git.sshKeysManager = com.gitblit.transport.ssh.MemoryKeyManager
 groovy.scriptsFolder = src/main/distrib/data/groovy
 groovy.preReceiveScripts = blockpush
 groovy.postReceiveScripts = sendmail

--
Gitblit v1.9.1