openshift war support (non express)

aholland

2014-02-24 2f3c342b5751f0ea41b0711b6d8757471572a79c

 src/main/java/com/gitblit/IStoredSettings.java

@@ -351,4 +351,13 @@
    * @return true if successful

    */

   public abstract boolean saveSettings(Map<String, String> updatedSettings);



   /**

    * Merge all settings from the settings parameter into this instance.

    *

    * @param settings

    */

   public void merge(IStoredSettings settings) {

      getSettings().putAll(settings.getSettings());

   }

}