Merged 8899:9136 and 9145 from trunk.

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index d366bc96b3922ed66c0e3f9037044c99932783ae..b884f3b938fea8c5ea541e0d4af5fbbc16529dd7 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,7 +12,7 @@
 #   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
+  database: openstreetmap

   username: openstreetmap
   password: openstreetmap
   host: localhost
   username: openstreetmap
   password: openstreetmap
   host: localhost


@@ -33,3 +33,4 @@ production:
   username: openstreetmap
   password: openstreetmap
   host: db.openstreetmap.org
   username: openstreetmap
   password: openstreetmap
   host: db.openstreetmap.org

+