API 0.4 Reverted minor errors in changeset 2324

diff --git a/config/database.yml b/config/database.yml
index 1297121217cee6acd714366622818a869d6e3083..1fe4d9880030befcca52870dee65ee62f69eb3ed 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -14,7 +14,7 @@ development:
   adapter: mysql
   database: openstreetmap
   username: openstreetmap
   adapter: mysql
   database: openstreetmap
   username: openstreetmap

-  password: 
+  password: openstreetmap

   host: localhost
 
 # Warning: The database defined as 'test' will be erased and
   host: localhost
 
 # Warning: The database defined as 'test' will be erased and

diff --git a/script/daemons b/script/daemons
index ff47d585cc25ccb24adc324ed58e3c71917873b9..feb98b645243dbc90acb1a792fbd1ab513254f24 100755 (executable)
--- a/script/daemons
+++ b/script/daemons
@@ -1,2 +1,2 @@
-#!/usr/bin/env ruby\r
-Dir[File.dirname(__FILE__) + "/../lib/daemons/*_ctl"].each {|f| `ruby #{f} #{ARGV.first}`} # TODO remove ruby - hack for windows
\ No newline at end of file
+#!/usr/bin/env ruby
+Dir[File.dirname(__FILE__) + "/../lib/daemons/*_ctl"].each {|f| `#{f} #{ARGV.first}`}
\ No newline at end of file