From 147520751ab9eef4c12fd8c263221061cd313955 Mon Sep 17 00:00:00 2001
From: Dan Wendorf <dwendorf@pivotal.io>
Date: Sat, 12 Sep 2015 21:41:34 -0700
Subject: [PATCH] Update chef to 12.4.1 from 11.6.0

Also update soloist to 1.0.3 from 1.0.1
---
 Gemfile.lock | 148 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 110 insertions(+), 38 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c787fe92..9e96e527 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,22 +1,46 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    awesome_print (1.1.0)
-    chef (11.6.0)
-      erubis
-      highline (>= 1.6.9)
-      json (>= 1.4.4, <= 1.7.7)
-      mixlib-authentication (>= 1.3.0)
-      mixlib-cli (~> 1.3.0)
-      mixlib-config (>= 1.1.2)
-      mixlib-log (>= 1.3.0)
-      mixlib-shellout
+    awesome_print (1.6.1)
+    builder (3.2.2)
+    chef (12.4.1)
+      chef-config (= 12.4.1)
+      chef-zero (~> 4.2, >= 4.2.2)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      erubis (~> 2.7)
+      ffi-yajl (~> 2.2)
+      highline (~> 1.6, >= 1.6.9)
+      mixlib-authentication (~> 1.3)
+      mixlib-cli (~> 1.4)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
       net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1.0)
-      ohai (>= 0.6.0)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
+      net-ssh-multi (~> 1.1)
+      ohai (~> 8.0)
+      plist (~> 3.1.0)
+      pry (~> 0.9)
+      rspec-core (~> 3.2)
+      rspec-expectations (~> 3.2)
+      rspec-mocks (~> 3.2)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+      syslog-logger (~> 1.6)
+    chef-config (12.4.1)
+      mixlib-config (~> 2.0)
+      mixlib-shellout (~> 2.0)
+    chef-zero (4.3.0)
+      ffi-yajl (~> 2.2)
+      hashie (~> 2.0)
+      mixlib-log (~> 1.3)
+      rack
+      uuidtools (~> 2.1)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
+    ffi (1.9.10)
+    ffi-yajl (2.2.2)
+      libyajl2 (~> 1.2)
     foodcritic (4.0.0)
       erubis
       gherkin (~> 2.11)
@@ -27,10 +51,9 @@ GEM
       yajl-ruby (~> 1.1)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    hashie (1.2.0)
-    highline (1.6.21)
+    hashie (2.1.2)
+    highline (1.7.3)
     ipaddress (0.8.0)
-    json (1.7.7)
     librarian (0.1.2)
       highline
       thor (~> 0.15)
@@ -38,49 +61,95 @@ GEM
       chef (>= 0.10)
       librarian (~> 0.1.0)
       minitar (>= 0.5.2)
-    mime-types (1.25)
+    libyajl2 (1.2.0)
+    method_source (0.8.2)
+    mime-types (2.6.1)
     mini_portile (0.6.0)
     minitar (0.5.4)
     mixlib-authentication (1.3.0)
       mixlib-log
-    mixlib-cli (1.3.0)
-    mixlib-config (1.1.2)
+    mixlib-cli (1.5.0)
+    mixlib-config (2.2.1)
     mixlib-log (1.6.0)
-    mixlib-shellout (1.2.0)
-    multi_json (1.10.1)
-    net-ssh (2.6.8)
+    mixlib-shellout (2.2.1)
+    multi_json (1.11.2)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.1)
-      net-ssh (>= 2.1.4)
-      net-ssh-gateway (>= 0.99.0)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    net-telnet (0.1.1)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
-    ohai (6.18.0)
+    ohai (8.5.1)
+      ffi (~> 1.9)
+      ffi-yajl (~> 2.2)
       ipaddress
+      mime-types (~> 2.0)
       mixlib-cli
-      mixlib-config
+      mixlib-config (~> 2.0)
       mixlib-log
-      mixlib-shellout
-      systemu
-      yajl-ruby
+      mixlib-shellout (~> 2.0)
+      rake (~> 10.1)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
     plist (3.1.0)
     polyglot (0.3.5)
-    rake (10.3.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.4)
+    rake (10.4.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rufus-lru (1.0.5)
-    soloist (1.0.1)
+    serverspec (2.23.1)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.43)
+    sfl (2.2)
+    slop (3.6.0)
+    soloist (1.0.3)
       awesome_print
       chef
-      hashie (~> 1.2)
+      hashie (~> 2.0)
       librarian-chef
       net-ssh
       thor
-    systemu (2.5.2)
-    thor (0.18.1)
+    specinfra (2.43.4)
+      net-scp
+      net-ssh (~> 2.7)
+      net-telnet
+      sfl
+    syslog-logger (1.6.8)
+    systemu (2.6.5)
+    thor (0.19.1)
     treetop (1.5.3)
       polyglot (~> 0.3)
+    uuidtools (2.1.5)
+    wmi-lite (1.0.0)
     yajl-ruby (1.2.1)
 
 PLATFORMS
@@ -90,3 +159,6 @@ DEPENDENCIES
   foodcritic
   plist
   soloist
+
+BUNDLED WITH
+   1.10.6