summaryrefslogtreecommitdiffstats
path: root/src/main/java/pt.py
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-03-17 09:31:52 -0400
committerJames Moger <james.moger@gitblit.com>2014-03-17 09:31:52 -0400
commit08704c63e1c5d8a089d0dba58c5fa3ba119a32a7 (patch)
tree9ee44978c1f7be14f50c2f42981142cf26ff6bb9 /src/main/java/pt.py
parentf8c1913bd9fb332bfa3ff722f6870216d5194c6f (diff)
downloadgitblit-08704c63e1c5d8a089d0dba58c5fa3ba119a32a7.tar.gz
gitblit-08704c63e1c5d8a089d0dba58c5fa3ba119a32a7.zip
Merge overrides in addition to merging the normal settings
Some command-line parameters are ignored due to a bug in the merge settings method which merges overrides into the normal settings map. This works fine until the settings class decides to reload from the pristine settings file which dumps the explicitly overrides. The solution is to merge the overrides in addition to the standard settings.
Diffstat (limited to 'src/main/java/pt.py')
0 files changed, 0 insertions, 0 deletions