From cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Oct 2011 21:03:52 -0400
Subject: [PATCH] Merge branch 'master' into rpc
---
docs/01_setup.mkd | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/docs/01_setup.mkd b/docs/01_setup.mkd
index 1c8db12..125bac2 100644
--- a/docs/01_setup.mkd
+++ b/docs/01_setup.mkd
@@ -130,7 +130,7 @@
accessRestriction = clone
isFrozen = false
showReadme = false
- excludeFromFederation = false
+ federationStrategy = FEDERATE_THIS
isFederated = false
federationSets =
@@ -172,6 +172,16 @@
public interface IUserService {
/**
+ * Setup the user service.
+ *
+ * @param settings
+ * @since 0.6.1
+ */
+ @Override
+ public void setup(IStoredSettings settings) {
+ }
+
+ /**
* Does the user service support cookie authentication?
*
* @return true or false
--
Gitblit v1.9.1