diff options
| author | zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9> | 2006-06-08 22:25:27 +0000 |
|---|---|---|
| committer | zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9> | 2006-06-08 22:25:27 +0000 |
| commit | 8bf572187f4a8bd2d2288a532aa8f66da5a242c4 (patch) | |
| tree | 079e358a3c0d4b2466d90a7a85c643d798c6cf75 /bin | |
| parent | 30b2effae4c4aa7352e7b30c8ee3f2179fc6ca9e (diff) | |
| download | unicorn-8bf572187f4a8bd2d2288a532aa8f66da5a242c4.tar.gz | |
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@232 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/mongrel_rails | 2 |
1 files changed, 1 insertions, 1 deletions
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 |