Merge branch 'master' of ssh://git.sc.realtravel.com:65522/git/exampl…

…e_api

.gitignore

@@ -1,4 +1,3 @@
 *log
 tmp/
-database.yml
-.DS_Store
+.DS_Store

config/database.yml

@@ -0,0 +1,50 @@
+# PostgreSQL. Versions 7.4 and 8.x are supported.
+#
+# Install the ruby-postgres driver:
+#   gem install ruby-postgres
+# On Mac OS X:
+#   gem install ruby-postgres -- --include=/usr/local/pgsql
+# On Windows:
+#   gem install ruby-postgres
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+development:
+  adapter: mysql
+  encoding: utf8
+  database: rt_api_example_dev
+  username: root
+  password: root
+  socket: /tmp/mysql.sock
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # The server defaults to notice.
+  #min_messages: warning
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: mysql
+  encoding: utf8
+  database: api_example_test
+  pool: 5
+  username: root
+  password:
+
+production:
+  adapter: postgresql
+  database: api_example_production
+  host: 127.0.0.1
+  username: postgres
+  password: