From 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 09:31:52 -0400
Subject: [PATCH] Merge overrides in addition to merging the normal settings
---
src/main/java/com/gitblit/IStoredSettings.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/IStoredSettings.java b/src/main/java/com/gitblit/IStoredSettings.java
index 6b58e89..9c7a2d2 100644
--- a/src/main/java/com/gitblit/IStoredSettings.java
+++ b/src/main/java/com/gitblit/IStoredSettings.java
@@ -359,5 +359,6 @@
*/
public void merge(IStoredSettings settings) {
getSettings().putAll(settings.getSettings());
+ overrides.putAll(settings.overrides);
}
}
\ No newline at end of file
--
Gitblit v1.9.1