openstack
/
cookbook-openstack-block-storage
Code Issues Proposed changes

Update Chef dependency to Chef 11 

Also add dependency on json <= 1.7.7, required by Chef 11.

Resolves problem: Bundler could not find compatible versions for gem
"json" (required for chef and berkshelf).

Partial fix for bug #1183540

Change-Id: Ia10a0256b782eafe70363e737f4f79ce2bb8be82
This commit is contained in:
sean 2013-06-06 13:20:48 -07:00
parent b89fc12d46
commit f52a5ec5ce
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -1,6 +1,7 @@
source "https://rubygems.org"
gem "chef", "~> 10.18.2"
gem "chef", "~> 11.4.4"
gem "json", "<= 1.7.7" # chef 11 dependency
gem "berkshelf", "~> 1.4.0"
gem "chefspec", "~> 1.2.0"
gem "foodcritic", "~> 2.1.0"

27
Gemfile.lock
View File

@ -26,26 +26,21 @@ GEM
thor (~> 0.18.0)
yajl-ruby
builder (3.2.2)
bunny (0.7.9)
celluloid (0.14.1)
timers (>= 1.0.0)
chef (10.18.2)
bunny (>= 0.6.0, < 0.8.0)
chef (11.4.4)
erubis
highline (>= 1.6.9)
json (>= 1.4.4, <= 1.6.1)
json (>= 1.4.4, <= 1.7.7)
mixlib-authentication (>= 1.3.0)
mixlib-cli (>= 1.1.0)
mixlib-cli (~> 1.3.0)
mixlib-config (>= 1.1.2)
mixlib-log (>= 1.3.0)
mixlib-shellout
moneta (< 0.7.0)
net-ssh (~> 2.2.2)
net-ssh (~> 2.6)
net-ssh-multi (~> 1.1.0)
ohai (>= 0.6.0)
rest-client (>= 1.0.4, < 1.7.0)
treetop (~> 1.4.9)
uuidtools
yajl-ruby (~> 1.1)
chefspec (1.2.0)
chef (>= 10.0)
@ -91,7 +86,7 @@ GEM
rack
i18n (0.6.1)
ipaddress (0.8.0)
json (1.6.1)
json (1.7.7)
little-plugger (1.1.3)
logging (1.6.2)
little-plugger (>= 1.1.3)
@ -108,14 +103,13 @@ GEM
mixlib-config (1.1.2)
mixlib-log (1.6.0)
mixlib-shellout (1.1.0)
moneta (0.6.0)
multi_json (1.7.5)
multi_xml (0.5.3)
multipart-post (1.2.0)
net-http-persistent (2.8)
net-ssh (2.2.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
net-ssh (2.6.7)
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)
@ -173,7 +167,7 @@ GEM
systemu (2.5.2)
thor (0.18.1)
timers (1.1.0)
treetop (1.4.12)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
uuidtools (2.1.4)
@ -194,6 +188,7 @@ PLATFORMS
DEPENDENCIES
berkshelf (~> 1.4.0)
chef (~> 10.18.2)
chef (~> 11.4.4)
chefspec (~> 1.2.0)
foodcritic (~> 2.1.0)
json (<= 1.7.7)