kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Fixes a bug where default settings always dominated config files.

Browse source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@232 19e92222-5c0b-0410-8929-a290d50e31e9
This commit is contained in:
zedshaw 2006-06-08 22:25:27 +00:00
parent 30b2effae4
commit 8bf572187f
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/mongrel_rails
View file

@ -80,7 +80,7 @@ class Start < GemPlugin::Plugin "/commands"
if @config_file
STDERR.puts "** Loading settings from #{@config_file} (command line options override)."
conf = YAML.load_file(@config_file)
settings = conf.merge(settings)
settings = settings.merge! conf
end
config = Mongrel::Rails::RailsConfigurator.new(settings) do