From c729c59cedff4e800c659e524081fbd1be8db3c1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 22 Sep 2011 16:09:37 -0400
Subject: [PATCH] Rearranged federation status enum.
---
src/com/gitblit/GitBlit.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 33eaee9..3e974b3 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -861,10 +861,10 @@
}
String setting = values.get(1);
if (setting.equals("url")) {
- // url of the remote Gitblit instance
+ // url of the origin Gitblit instance
federatedModels.get(server).url = settings.getString(key, "");
} else if (setting.equals("token")) {
- // token for the remote Gitblit instance
+ // token for the origin Gitblit instance
federatedModels.get(server).token = settings.getString(key, "");
} else if (setting.equals("frequency")) {
// frequency of the pull operation
@@ -872,9 +872,9 @@
} else if (setting.equals("folder")) {
// destination folder of the pull operation
federatedModels.get(server).folder = settings.getString(key, "");
- } else if (setting.equals("freeze")) {
- // set the repository to read-only after pull
- federatedModels.get(server).freeze = settings.getBoolean(key, true);
+ } else if (setting.equals("mirror")) {
+ // are the repositories to be true mirrors of the origin
+ federatedModels.get(server).mirror = settings.getBoolean(key, true);
} else if (setting.equals("mergeAccounts")) {
// merge remote accounts into local accounts
federatedModels.get(server).mergeAccounts = settings.getBoolean(key, false);
--
Gitblit v1.9.1