Merge remote-tracking branch 'github/pull/559'

[chef.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 81b3a819bc5c4e23ab22f91dd927b5c628089c35..4c2e08abd5407a9e65904b7a47e5a56584157a75 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,22 +60,22 @@ GEM
     rainbow (3.1.1)
     regexp_parser (2.6.0)
     rexml (3.2.5)
     rainbow (3.1.1)
     regexp_parser (2.6.0)
     rexml (3.2.5)

-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)

       diff-lcs (>= 1.2.0, < 2.0)
       diff-lcs (>= 1.2.0, < 2.0)

-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.12.0)

     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)

-    rspec-mocks (3.11.1)
+    rspec-mocks (3.12.1)

       diff-lcs (>= 1.2.0, < 2.0)
       diff-lcs (>= 1.2.0, < 2.0)

-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)

     rubocop (1.25.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
     rubocop (1.25.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)


@@ -90,13 +90,13 @@ GEM
     ruby-progressbar (1.11.0)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
     ruby-progressbar (1.11.0)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)

-    serverspec (2.42.0)
+    serverspec (2.42.1)

       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.72)
     sfl (2.3)
       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.72)
     sfl (2.3)

-    specinfra (2.83.3)
+    specinfra (2.84.0)

       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)