From cbd0caa7f95ea331ecd7b6daf71b11854f14e4ee Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 09 Aug 2012 09:49:06 -0400
Subject: [PATCH] Merge branch 'ldap+tls' of https://github.com/StephenKing/gitblit
---
tests/com/gitblit/tests/LdapUserServiceTest.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tests/com/gitblit/tests/LdapUserServiceTest.java b/tests/com/gitblit/tests/LdapUserServiceTest.java
index 390fa00..ffe8264 100644
--- a/tests/com/gitblit/tests/LdapUserServiceTest.java
+++ b/tests/com/gitblit/tests/LdapUserServiceTest.java
@@ -68,7 +68,7 @@
}
private MemorySettings getSettings() {
- Map<Object, Object> backingMap = new HashMap<Object, Object>();
+ Map<String, Object> backingMap = new HashMap<String, Object>();
backingMap.put("realm.ldap.server", "ldap://localhost:" + ldapPort);
backingMap.put("realm.ldap.domain", "");
backingMap.put("realm.ldap.username", "cn=Directory Manager");
--
Gitblit v1.9.1