fix accidental commit of local config changes

diff --git a/config/database.yml b/config/database.yml
index 09c9dbe6b79a1e413c814963fca7517900cdc6c3..cc3f9a1a5fb26e4fd5b2186728c3e4d5c6b45127 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,9 +12,9 @@
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql

-  database: osm
-  username: osm
-  password: osm
+  database: openstreetmap
+  username: openstreetmap
+  password: openstreetmap

   host: localhost
   encoding: utf8
 
   host: localhost
   encoding: utf8
 

diff --git a/config/environment.rb b/config/environment.rb
index 2c9e4803c94af6de128ee1d62daf0cd1411cd09a..171bb6fc8e5d4b688cad375ac39574e953669259 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -60,7 +60,7 @@ Rails::Initializer.run do |config|
 
   # Force all environments to use the same logger level
   # (by default production uses :info, the others :debug)
 
   # Force all environments to use the same logger level
   # (by default production uses :info, the others :debug)

-  config.log_level = :debug
+  # config.log_level = :debug

 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!
 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!