From dd9ae71bc1cb13b90dcc8d9689550eb7dfe7d035 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 25 Sep 2011 09:45:45 -0400
Subject: [PATCH] Revised federation proposal mechanism. Added SendProposalPage.
---
src/com/gitblit/models/FederationModel.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/models/FederationModel.java b/src/com/gitblit/models/FederationModel.java
index 017c2e0..3905190 100644
--- a/src/com/gitblit/models/FederationModel.java
+++ b/src/com/gitblit/models/FederationModel.java
@@ -46,6 +46,8 @@
public String folder;
+ public boolean mirror;
+
public boolean mergeAccounts;
public boolean sendStatus;
@@ -134,7 +136,7 @@
if (results.size() == 0) {
return FederationPullStatus.PENDING;
}
- FederationPullStatus status = FederationPullStatus.PULLED;
+ FederationPullStatus status = FederationPullStatus.MIRRORED;
for (FederationPullStatus result : results.values()) {
if (result.ordinal() < status.ordinal()) {
status = result;
--
Gitblit v1.9.1