summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-09-22 16:09:37 -0400
committerJames Moger <james.moger@gitblit.com>2011-09-22 16:09:37 -0400
commitc729c59cedff4e800c659e524081fbd1be8db3c1 (patch)
tree6bc54959fa43e4264f1ca0f669c0a94aa50fc843 /src/com
parent2548a7e99ce7c6f5b7379a44ec92be80a0adac3d (diff)
downloadgitblit-c729c59cedff4e800c659e524081fbd1be8db3c1.tar.gz
gitblit-c729c59cedff4e800c659e524081fbd1be8db3c1.zip
Rearranged federation status enum.
Diffstat (limited to 'src/com')
-rw-r--r--src/com/gitblit/Constants.java2
-rw-r--r--src/com/gitblit/models/FederationModel.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index 3360028d..b52f055d 100644
--- a/src/com/gitblit/Constants.java
+++ b/src/com/gitblit/Constants.java
@@ -135,7 +135,7 @@ public class Constants {
* Enumeration representing the statii of federation requests.
*/
public static enum FederationPullStatus {
- PENDING, FAILED, SKIPPED, NOCHANGE, PULLED, MIRRORED, EXCLUDED;
+ PENDING, FAILED, SKIPPED, PULLED, MIRRORED, NOCHANGE, EXCLUDED;
public static FederationPullStatus fromName(String name) {
for (FederationPullStatus type : values()) {
diff --git a/src/com/gitblit/models/FederationModel.java b/src/com/gitblit/models/FederationModel.java
index 6e608d8f..39051909 100644
--- a/src/com/gitblit/models/FederationModel.java
+++ b/src/com/gitblit/models/FederationModel.java
@@ -136,7 +136,7 @@ public class FederationModel implements Serializable, Comparable<FederationModel
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;