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/main/java/com/gitblit/manager/IManager.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/manager/IManager.java b/src/main/java/com/gitblit/manager/IManager.java
index 955c610..44df5cd 100644
--- a/src/main/java/com/gitblit/manager/IManager.java
+++ b/src/main/java/com/gitblit/manager/IManager.java
@@ -17,7 +17,20 @@
 
 public interface IManager {
 
-	IManager setup();
+	/**
+	 * Start the manager.
+	 *
+	 * @return the manager
+ 	 * @since 1.4.0
+	 */
+	IManager start();
 
+	/**
+	 * Stop the manager.
+	 *
+	 * @return the manager
+ 	 * @since 1.4.0
+	 */
 	IManager stop();
+
 }

--
Gitblit v1.9.1