From 8bf572187f4a8bd2d2288a532aa8f66da5a242c4 Mon Sep 17 00:00:00 2001 From: zedshaw Date: Thu, 8 Jun 2006 22:25:27 +0000 Subject: Fixes a bug where default settings always dominated config files. git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@232 19e92222-5c0b-0410-8929-a290d50e31e9 --- bin/mongrel_rails | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/mongrel_rails b/bin/mongrel_rails index 6eae4bc..61306bc 100644 --- a/bin/mongrel_rails +++ b/bin/mongrel_rails @@ -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 -- cgit v1.2.3-24-ge0c7