From 82667017f9412abd6e6ca56e8af2d457a7a888a3 Mon Sep 17 00:00:00 2001
From: David Thompson <david.thompson@digital.cabinet-office.gov.uk>
Date: Tue, 7 Aug 2012 13:36:33 +0100
Subject: [PATCH 1/2] Bump Mongo and associated gems to 1.6.0.

This release contains  a bug fix for our recent Mongo connection errors.
See the bug report here: <https://jira.mongodb.org/browse/RUBY-403>
---
 Gemfile      |  6 +++---
 Gemfile.lock | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 83229cd5..bfa0efda 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,9 +25,9 @@ gem 'colorize', '~> 0.5.8'
 gem 'rummageable', "~> 0.3.0"
 
 gem "mongoid", "~> 2.4.2"
-gem "mongo", "1.5.2"
-gem "bson_ext", "1.5.2"
-gem "bson", "1.5.2"
+gem "mongo", "1.6.0"
+gem "bson_ext", "1.6.0"
+gem "bson", "1.6.0"
 gem 'lograge'
 
 if ENV['CONTENT_MODELS_DEV']
diff --git a/Gemfile.lock b/Gemfile.lock
index 0ea3d2ec..02f4f2b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,9 +55,9 @@ GEM
       mail (> 2.2.5)
       mime-types
       xml-simple
-    bson (1.5.2)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
+    bson (1.6.0)
+    bson_ext (1.6.0)
+      bson (= 1.6.0)
     builder (3.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -156,8 +156,8 @@ GEM
     minitest (2.10.0)
     mocha (0.10.1)
       metaclass (~> 0.0.1)
-    mongo (1.5.2)
-      bson (= 1.5.2)
+    mongo (1.6.0)
+      bson (= 1.6.0)
     mongoid (2.4.12)
       activemodel (~> 3.1)
       mongo (<= 1.6.2)
@@ -279,8 +279,8 @@ PLATFORMS
 DEPENDENCIES
   ansi
   aws-ses
-  bson (= 1.5.2)
-  bson_ext (= 1.5.2)
+  bson (= 1.6.0)
+  bson_ext (= 1.6.0)
   capybara-mechanize (~> 0.3.0.rc3)
   ci_reporter
   colorize (~> 0.5.8)
@@ -300,7 +300,7 @@ DEPENDENCIES
   lograge
   minitest
   mocha
-  mongo (= 1.5.2)
+  mongo (= 1.6.0)
   mongoid (~> 2.4.2)
   nokogiri
   null_logger

From 38a2984b73484699c312275468755a55ac2a570c Mon Sep 17 00:00:00 2001
From: David Thompson <david.thompson@digital.cabinet-office.gov.uk>
Date: Wed, 8 Aug 2012 10:16:53 +0100
Subject: [PATCH 2/2] Bump version to 1.6.2 for Publisher consistency.

---
 Gemfile      |  6 +++---
 Gemfile.lock | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index bfa0efda..fe4a9b16 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,9 +25,9 @@ gem 'colorize', '~> 0.5.8'
 gem 'rummageable', "~> 0.3.0"
 
 gem "mongoid", "~> 2.4.2"
-gem "mongo", "1.6.0"
-gem "bson_ext", "1.6.0"
-gem "bson", "1.6.0"
+gem "mongo", "1.6.2"
+gem "bson_ext", "1.6.2"
+gem "bson", "1.6.2"
 gem 'lograge'
 
 if ENV['CONTENT_MODELS_DEV']
diff --git a/Gemfile.lock b/Gemfile.lock
index 02f4f2b2..da3032b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,9 +55,9 @@ GEM
       mail (> 2.2.5)
       mime-types
       xml-simple
-    bson (1.6.0)
-    bson_ext (1.6.0)
-      bson (= 1.6.0)
+    bson (1.6.2)
+    bson_ext (1.6.2)
+      bson (~> 1.6.2)
     builder (3.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -156,8 +156,8 @@ GEM
     minitest (2.10.0)
     mocha (0.10.1)
       metaclass (~> 0.0.1)
-    mongo (1.6.0)
-      bson (= 1.6.0)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
     mongoid (2.4.12)
       activemodel (~> 3.1)
       mongo (<= 1.6.2)
@@ -279,8 +279,8 @@ PLATFORMS
 DEPENDENCIES
   ansi
   aws-ses
-  bson (= 1.6.0)
-  bson_ext (= 1.6.0)
+  bson (= 1.6.2)
+  bson_ext (= 1.6.2)
   capybara-mechanize (~> 0.3.0.rc3)
   ci_reporter
   colorize (~> 0.5.8)
@@ -300,7 +300,7 @@ DEPENDENCIES
   lograge
   minitest
   mocha
-  mongo (= 1.6.0)
+  mongo (= 1.6.2)
   mongoid (~> 2.4.2)
   nokogiri
   null_logger