Update Gemfile and remove Gemfile.lock

This bumps berkshelf to 2.0.18 since we're getting failures w/ 2.0.10.

Change-Id: I3acaee40cf6c1284d0db33c643c460f03efefb51
Related-Bug: 1338972
This commit is contained in:
Matt Thompson
2014-07-09 21:41:17 +01:00
parent 886728877c
commit 7dc5d51fca
3 changed files with 6 additions and 179 deletions

View File

@@ -1,6 +1,9 @@
# CHANGELOG for openstack-chef-repo
This file is used to list changes made in each version of openstack-chef-repo
## 9.1.0
* Bump berkshelf to 2.0.18
## 9.0.2
* Add new openrc recipe to all in one role for demos and testing

View File

@@ -4,4 +4,6 @@ gem "chef", "~> 11.6.2"
gem "json", "<= 1.7.7" # chef dependency
gem "knife-block", "~> 0.0.6"
gem "spiceweasel", "~> 2.6.0"
gem "berkshelf", "~> 2.0.10"
gem "berkshelf", "~> 2.0.18"
gem "hashie", "~> 2.0"
gem "rspec", "~> 2.14.1"

View File

@@ -1,178 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (3.2.14)
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 (2.0.10)
activesupport (~> 3.2.0)
addressable (~> 2.3.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.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-ruby_engine (0.1.0)
buff-shell_out (0.1.0)
buff-ruby_engine (~> 0.1.0)
builder (3.2.2)
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)
json (>= 1.4.4, <= 1.7.7)
mixlib-authentication (~> 1.3)
mixlib-cli (~> 1.3)
mixlib-config (~> 1.1, >= 1.1.2)
mixlib-log (~> 1.3)
mixlib-shellout (~> 1.1)
net-ssh (~> 2.6)
net-ssh-multi (~> 1.1.0)
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)
erubis (2.7.0)
faraday (0.8.8)
multipart-post (~> 1.2.0)
ffi (1.9.0)
gssapi (1.0.3)
ffi (>= 1.0.1)
gyoku (1.1.0)
builder (>= 2.1.2)
hashie (2.0.5)
highline (1.6.19)
httpclient (2.3.4.1)
httpi (0.9.7)
rack
i18n (0.6.5)
ipaddress (0.8.0)
json (1.7.7)
knife-block (0.0.9)
little-plugger (1.1.3)
logging (1.8.1)
little-plugger (>= 1.1.3)
multi_json (>= 1.3.6)
mime-types (1.25)
mini_portile (0.5.1)
minitar (0.5.4)
mixlib-authentication (1.3.0)
mixlib-log
mixlib-cli (1.3.0)
mixlib-config (1.1.2)
mixlib-log (1.6.0)
mixlib-shellout (1.2.0)
multi_json (1.8.1)
multipart-post (1.2.0)
net-http-persistent (2.9)
net-ssh (2.7.0)
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)
nio4r (0.5.0)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
nori (1.1.5)
ohai (6.18.0)
ipaddress
mixlib-cli
mixlib-config
mixlib-log
mixlib-shellout
systemu
yajl-ruby
rack (1.5.2)
rbzip2 (0.2.0)
rest-client (1.6.7)
mime-types (>= 1.16)
retryable (1.3.3)
ridley (1.5.3)
addressable
buff-config (~> 0.2)
buff-extensions (~> 0.3)
buff-ignore (~> 1.1)
buff-shell_out (~> 0.1)
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)
winrm (~> 1.1.0)
rubyntlm (0.1.1)
savon (0.9.5)
akami (~> 1.0)
builder (>= 2.1.2)
gyoku (>= 0.4.0)
httpi (~> 0.9)
nokogiri (>= 1.4.0)
nori (~> 1.0)
wasabi (~> 1.0)
solve (0.8.1)
spiceweasel (2.6.0)
berkshelf (< 3)
chef (>= 0.10)
mixlib-cli
mixlib-config
mixlib-log
mixlib-shellout
solve
yajl-ruby
systemu (2.5.2)
thor (0.18.1)
timers (1.1.0)
uuidtools (2.1.4)
varia_model (0.2.0)
buff-extensions (~> 0.2)
hashie (>= 2.0.2)
wasabi (1.0.0)
nokogiri (>= 1.4.0)
winrm (1.1.3)
gssapi (~> 1.0.0)
httpclient (~> 2.2, >= 2.2.0.2)
logging (~> 1.6, >= 1.6.1)
nokogiri (~> 1.5)
rubyntlm (~> 0.1.1)
savon (= 0.9.5)
uuidtools (~> 2.1.2)
yajl-ruby (1.1.0)
PLATFORMS
ruby
DEPENDENCIES
berkshelf (~> 2.0.10)
chef (~> 11.6.2)
json (<= 1.7.7)
knife-block (~> 0.0.6)
spiceweasel (~> 2.6.0)