summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2016-01-05 15:17:20 -0800
committertyler-ball <tyleraball@gmail.com>2016-01-06 15:21:10 -0800
commitd8f3df78735e6b09d743f12b1042f57490496d51 (patch)
tree63f4400c12e8bc168ecb1e53a80a9fb305cec9ec
parent50c1806021ee359196d171b3b8f0c7e8801fe065 (diff)
downloadchef-d8f3df78735e6b09d743f12b1042f57490496d51.tar.gz
Pulling in the latest omnibus changes where we put all cached items into .../src/<software definition name>/<package>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock15
2 files changed, 8 insertions, 9 deletions
diff --git a/Gemfile b/Gemfile
index 09945709ca..ad415d576a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'omnibus', github: 'chef/omnibus', branch: 'tball/chefdk'
+gem 'omnibus', github: 'chef/omnibus'
gem 'omnibus-software', github: 'chef/omnibus-software'
# This development group is installed by default when you run `bundle install`,
diff --git a/Gemfile.lock b/Gemfile.lock
index d3e31c21b7..c9596a8d6b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,8 +6,7 @@ GIT
GIT
remote: git://github.com/chef/omnibus.git
- revision: 75e7077d5c5cc0c42e019afd3d107708e0b0164a
- branch: tball/chefdk
+ revision: f1231f74ebda76530e73fd6416e1ee7eb7be3656
specs:
omnibus (5.0.0)
aws-sdk (~> 2)
@@ -23,12 +22,12 @@ GEM
remote: https://rubygems.org/
specs:
addressable (2.3.8)
- aws-sdk (2.2.8)
- aws-sdk-resources (= 2.2.8)
- aws-sdk-core (2.2.8)
+ aws-sdk (2.2.9)
+ aws-sdk-resources (= 2.2.9)
+ aws-sdk-core (2.2.9)
jmespath (~> 1.0)
- aws-sdk-resources (2.2.8)
- aws-sdk-core (= 2.2.8)
+ aws-sdk-resources (2.2.9)
+ aws-sdk-core (= 2.2.9)
berkshelf (3.2.4)
addressable (~> 2.3.4)
berkshelf-api-client (~> 1.2)
@@ -85,7 +84,7 @@ GEM
hitimes (1.2.2)
hitimes (1.2.2-x86-mingw32)
httpclient (2.6.0.1)
- ipaddress (0.8.0)
+ ipaddress (0.8.2)
jmespath (1.1.3)
json (1.8.3)
kitchen-vagrant (0.19.0)