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/fanout/FanoutConstants.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/fanout/FanoutConstants.java b/src/main/java/com/gitblit/fanout/FanoutConstants.java
index 6e6964c..84fd2c5 100644
--- a/src/main/java/com/gitblit/fanout/FanoutConstants.java
+++ b/src/main/java/com/gitblit/fanout/FanoutConstants.java
@@ -25,11 +25,11 @@
public final static String CH_DEBUG = "debug";
public final static String MSG_CONNECTED = "connected...";
public final static String MSG_BUSY = "busy";
-
+
public static String getRemoteSocketId(Socket socket) {
return socket.getInetAddress().getHostAddress() + ":" + socket.getPort();
}
-
+
public static String getLocalSocketId(Socket socket) {
return socket.getInetAddress().getHostAddress() + ":" + socket.getLocalPort();
}
--
Gitblit v1.9.1