From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 10 Aug 2016 08:26:28 +0000 (+0200)
Subject: Use ruby-json 1.8.2 instead of 1.8.1 to build on travis
X-Git-Tag: rec-4.0.2~44^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4303%2Fhead;p=thirdparty%2Fpdns.git

Use ruby-json 1.8.2 instead of 1.8.1 to build on travis

Since travis upgraded their trusty image, ruby has been updated to
2.3.1 and doesn't play well with ruby-json 1.8.1.
This should be fixed in 1.8.2 according to
https://github.com/flori/json/issues/229
---

diff --git a/modules/remotebackend/Gemfile.lock b/modules/remotebackend/Gemfile.lock
index fa51dff95e..88dee08a2e 100644
--- a/modules/remotebackend/Gemfile.lock
+++ b/modules/remotebackend/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
       ffi-rzmq-core (>= 1.0.1)
     ffi-rzmq-core (1.0.3)
       ffi (~> 1.9)
-    json (1.8.1)
+    json (1.8.2)
     sqlite3 (1.3.9)
     webrick (1.3.1)
     zeromqrb (0.1.3)
diff --git a/modules/remotebackend/regression-tests/Gemfile.lock b/modules/remotebackend/regression-tests/Gemfile.lock
index 276a96c9c0..1ec718b939 100644
--- a/modules/remotebackend/regression-tests/Gemfile.lock
+++ b/modules/remotebackend/regression-tests/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
       ffi-rzmq-core (>= 1.0.1)
     ffi-rzmq-core (1.0.3)
       ffi (~> 1.9)
-    json (1.8.1)
+    json (1.8.2)
     sqlite3 (1.3.9)
     webrick (1.3.1)
     zeromqrb (0.1.3)