further preparing release

markschmidt · Oct 23, 2010 · a55d1d7 · a55d1d7
1 parent ecb5ae0
commit a55d1d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 28 deletions.
diff --git a/build/database.yml.example b/build/database.yml.example
@@ -1,29 +1,9 @@
-development:
-  adapter: mysql
-  encoding: utf8
-  reconnect: false
-  database: graylog2_development
-  pool: 5
-  username: root
-  password: 123123123
-  socket: /var/run/mysqld/mysqld.sock
-
-test:
-  adapter: mysql
-  encoding: utf8
-  reconnect: false
-  database: graylog2_test
-  pool: 5
-  username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
-
 production:
   adapter: mysql
   encoding: utf8
   reconnect: false
-  database: graylog2_production
+  database: graylog2
   pool: 5
-  username: root
+  username: graylog2
   password: 
   socket: /var/run/mysqld/mysqld.sock
diff --git a/build/mongodb.yml.example b/build/mongodb.yml.example
@@ -1,6 +1,6 @@
 production:
   hostname: localhost
-  database: graylog2_development
+  database: graylog2
   port: 27017
   authenticate: false
   username:

diff --git a/config/environment.rb b/config/environment.rb
@@ -5,12 +5,12 @@
 
 Rails::Initializer.run do |config|
   config.gem 'json', :version => '1.4.6'
-  config.gem 'bson', :version => '1.0.4'
-  config.gem 'mongo', :version => '1.0.7'
-  config.gem 'bson_ext', :version => '1.0.4', :lib => false
-  config.gem 'mongo_mapper', :version => '0.8.3'
+  config.gem 'bson', :version => '1.1.1'
+  config.gem 'mongo', :version => '1.1.1'
+  config.gem 'bson_ext', :version => '1.1.1', :lib => false
+  config.gem 'mongo_mapper', :version => '0.8.6'
   config.gem 'jnunemaker-validatable', :version => '1.8.4', :lib => false # Dependency of mongo_mapper
-  config.gem 'plucky', :version => '0.3.4' # Dependency of mongo_mapper
+  config.gem 'plucky', :version => '0.3.6' # Dependency of mongo_mapper
   config.gem 'mysql', :version => '2.8.1'
   config.gem 'rack', :version => '1.1.0'