Merge pull request #358 from opdemand/berkshelf-stable

Downgrade to berkshelf stable, since 3.0.0 beta is problematic

Author: mboersma

Berksfile

@@ -1,4 +1,4 @@
-source "http://api.berkshelf.com"
+site :opscode
 
 cookbook 'apt'
 cookbook 'rsyslog'

Berksfile.lock

@@ -1,5 +1,5 @@
 {
-  "dependencies": {
+  "sources": {
     "apt": {
       "locked_version": "2.3.0"
     },
@@ -12,7 +12,7 @@
     "deis": {
       "locked_version": "0.3.0",
       "git": "https://github.com/opdemand/deis-cookbook.git",
-      "ref": "5aacadebef5121fda002df7b8dbf853b26d6a5c2"
+      "ref": "cb7ea38a10be3ac9f80a412f81cdc23ce0337c0e"
     }
   }
 }

Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 gem 'chef'
 gem 'foodcritic'
-gem 'berkshelf', '3.0.0.beta3' # needed for --ssl-verify=false support
+#gem 'berkshelf', '3.0.0.beta3' # needed for --ssl-verify=false support
+gem "berkshelf", "~> 2.0.10"
 
 gem 'knife-ec2'
 gem 'knife-rackspace'

Gemfile.lock

@@ -1,36 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (3.2.16)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
     addressable (2.3.5)
     akami (1.2.0)
       gyoku (>= 0.4.0)
       nokogiri (>= 1.4.0)
-    berkshelf (3.0.0.beta3)
+    berkshelf (2.0.10)
+      activesupport (~> 3.2.0)
       addressable (~> 2.3.4)
-      buff-config (~> 0.2)
-      buff-extensions (~> 0.4)
       buff-shell_out (~> 0.1)
+      chozo (>= 0.6.1)
       faraday (>= 0.8.5)
       hashie (>= 2.0.2)
       minitar (~> 0.5.4)
+      rbzip2 (~> 0.2.0)
       retryable (~> 1.3.3)
-      ridley (~> 1.6)
-      solve (>= 0.8.0)
+      ridley (~> 1.5.0)
+      solve (>= 0.5.0)
       thor (~> 0.18.0)
     buff-config (0.4.0)
       buff-extensions (~> 0.3)
       varia_model (~> 0.1)
     buff-extensions (0.5.0)
-    buff-ignore (1.1.0)
+    buff-ignore (1.1.1)
     buff-ruby_engine (0.1.0)
     buff-shell_out (0.1.1)
       buff-ruby_engine (~> 0.1.0)
     builder (3.2.2)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
+    celluloid (0.14.1)
+      timers (>= 1.0.0)
+    celluloid-io (0.14.1)
+      celluloid (>= 0.14.1)
+      nio4r (>= 0.4.5)
     chef (11.6.2)
       erubis (~> 2.7)
       highline (~> 1.6, >= 1.6.9)
@@ -45,6 +49,10 @@ GEM
       ohai (>= 0.6.0, < 7.0.0)
       rest-client (>= 1.0.4, < 1.7.0)
       yajl-ruby (~> 1.1)
+    chozo (0.6.1)
+      activesupport (>= 3.2.0)
+      hashie (>= 2.0.2)
+      multi_json (>= 1.3.0)
     digital_ocean (1.2.0)
       faraday (~> 0.8.7)
       faraday_middleware (~> 0.9.0)
@@ -84,21 +92,22 @@ GEM
     httpclient (2.3.4.1)
     httpi (0.9.7)
       rack
+    i18n (0.6.9)
     ipaddress (0.8.0)
     json (1.7.7)
-    knife-digital_ocean (0.2.0)
+    knife-digital_ocean (0.3.0)
       chef (>= 10.18)
       digital_ocean (~> 1.2.0)
       highline
     knife-ec2 (0.6.6)
       chef (>= 0.10.10)
       fog (~> 1.15.0)
       knife-windows (>= 0.5.12)
-    knife-rackspace (0.8.1)
+    knife-rackspace (0.8.4)
       chef (>= 0.10.10)
       fog (~> 1.12)
       knife-windows
-    knife-windows (0.5.12)
+    knife-windows (0.5.14)
       em-winrm (= 0.5.4)
     little-plugger (1.1.3)
     logging (1.8.1)
@@ -112,7 +121,7 @@ GEM
     mixlib-cli (1.3.0)
     mixlib-config (1.1.2)
     mixlib-log (1.6.0)
-    mixlib-shellout (1.2.0)
+    mixlib-shellout (1.3.0)
     multi_json (1.8.2)
     multipart-post (1.2.0)
     net-http-persistent (2.9)
@@ -139,24 +148,26 @@ GEM
     rack (1.5.2)
     rash (0.4.0)
       hashie (~> 2.0.0)
+    rbzip2 (0.2.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     retryable (1.3.3)
-    ridley (1.7.1)
+    ridley (1.5.3)
       addressable
       buff-config (~> 0.2)
       buff-extensions (~> 0.3)
       buff-ignore (~> 1.1)
       buff-shell_out (~> 0.1)
-      celluloid (~> 0.15)
-      celluloid-io (~> 0.15)
+      celluloid (~> 0.14.0)
+      celluloid-io (~> 0.14.0)
       erubis
       faraday (>= 0.8.4)
       hashie (>= 2.0.2)
       json (>= 1.7.7)
       mixlib-authentication (>= 1.3.0)
       net-http-persistent (>= 2.8)
       net-ssh
+      nio4r (>= 0.5.0)
       retryable
       solve (>= 0.4.4)
       varia_model (~> 0.1)
@@ -171,7 +182,7 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.0)
       wasabi (~> 1.0)
-    solve (0.8.1)
+    solve (0.8.2)
     systemu (2.5.2)
     thor (0.18.1)
     timers (1.1.0)
@@ -195,7 +206,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  berkshelf (= 3.0.0.beta3)
+  berkshelf (~> 2.0.10)
   chef
   foodcritic
   knife-digital_ocean