From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result
---
src/main/java/com/gitblit/FederationClient.java | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/gitblit/FederationClient.java b/src/main/java/com/gitblit/FederationClient.java
index 4f4b00b..628a05d 100644
--- a/src/main/java/com/gitblit/FederationClient.java
+++ b/src/main/java/com/gitblit/FederationClient.java
@@ -32,6 +32,7 @@
import com.gitblit.manager.RuntimeManager;
import com.gitblit.manager.UserManager;
import com.gitblit.models.FederationModel;
+import com.gitblit.models.Mailing;
import com.gitblit.service.FederationPullService;
import com.gitblit.utils.FederationUtils;
import com.gitblit.utils.StringUtils;
@@ -178,23 +179,11 @@
}
@Override
- public void sendMail(String subject, String message, String... toAddresses) {
- }
-
- @Override
public void sendHtmlMail(String subject, String message, Collection<String> toAddresses) {
}
@Override
- public void sendHtmlMail(String subject, String message, String... toAddresses) {
- }
-
- @Override
- public void sendHtmlMail(String from, String subject, String message, Collection<String> toAddresses) {
- }
-
- @Override
- public void sendHtmlMail(String from, String subject, String message, String... toAddresses) {
+ public void send(Mailing mailing) {
}
}
}
--
Gitblit v1.9.1