From a4343e53feb582103366bb9c02628a4c6b29fcbd Mon Sep 17 00:00:00 2001
From: Tyler Brock <tyler.brock@gmail.com>
Date: Wed, 22 Feb 2012 10:41:44 -0500
Subject: [PATCH] Release 1.6.0

---
 docs/HISTORY.md      | 15 +++++++++++++++
 ext/cbson/version.h  |  2 +-
 lib/bson.rb          |  4 ++--
 lib/mongo/version.rb |  2 +-
 mongo.gemspec        |  2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/docs/HISTORY.md b/docs/HISTORY.md
index 6e6e0b6..1a3808b 100644
--- a/docs/HISTORY.md
+++ b/docs/HISTORY.md
@@ -1,5 +1,20 @@
 # MongoDB Ruby Driver History
 
+### 1.6.0
+2012-02-22
+
+* Added Gemfile
+* ReplSetConnection seed format is now array of 'host:port' strings
+* Added read preference :secondary_only
+* Added ability to log duration -- enabled by default (Cyril Mougel)
+* Added read_only option for DB#add_user (Ariel Salomon)
+* Added :collect_on_error option for bulk-insert (Masahiro Nakagawa)
+* Added and updated URI options (now case insensitive)
+* Bug fix for ReplSet refresh attempting to close a closed socket
+* Default op_timeout for ReplSetConnection is now disabled (was 30 seconds)
+* Support db output option for map reduce (John Ewart)
+* Support for keeping limited versions of files using GridFS (VvanGemert)
+
 ### 1.5.2
 2011-12-13
 
diff --git a/ext/cbson/version.h b/ext/cbson/version.h
index ad1aa43..bf759af 100644
--- a/ext/cbson/version.h
+++ b/ext/cbson/version.h
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-#define VERSION "1.5.2"
+#define VERSION "1.6.0"
diff --git a/lib/bson.rb b/lib/bson.rb
index bd0dd4b..d8fe52a 100644
--- a/lib/bson.rb
+++ b/lib/bson.rb
@@ -16,10 +16,10 @@
 # limitations under the License.
 # ++
 
-MINIMUM_BSON_EXT_VERSION = "1.5.2"
+MINIMUM_BSON_EXT_VERSION = "1.6.0"
 
 module BSON
-  VERSION = "1.5.2"
+  VERSION = "1.6.0"
 
   if defined? Mongo::DEFAULT_MAX_BSON_SIZE
     DEFAULT_MAX_BSON_SIZE = Mongo::DEFAULT_MAX_BSON_SIZE
diff --git a/lib/mongo/version.rb b/lib/mongo/version.rb
index 9d3e53e..7e8e2b4 100644
--- a/lib/mongo/version.rb
+++ b/lib/mongo/version.rb
@@ -1,3 +1,3 @@
 module Mongo
-  VERSION = "1.5.2"
+  VERSION = "1.6.0"
 end
diff --git a/mongo.gemspec b/mongo.gemspec
index a0e08a2..973eebd 100644
--- a/mongo.gemspec
+++ b/mongo.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--main', 'README.md', '--inline-source']
   s.extra_rdoc_files = ['README.md']
 
-  s.authors = ['Jim Menard', 'Mike Dirolf', 'Kyle Banker']
+  s.authors = ['Jim Menard', 'Mike Dirolf', 'Kyle Banker', 'Tyler Brock']
   s.email = 'mongodb-dev@googlegroups.com'
   s.homepage = 'http://www.mongodb.org'