summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Wrock <matt@mattwrock.com>2016-10-03 14:37:53 -0700
committerGitHub <noreply@github.com>2016-10-03 14:37:53 -0700
commit9c7f3aefe2f9049f70808ed4f1ae83d0ff667807 (patch)
treeba8ef686ebb4818d6ebed8eec450d8818f672df6
parent85e84c3544917014dc8d3dc245566c60ffd1c91a (diff)
parentb9989aa0578ee16ee0bf02cf9f24b5aa14c95087 (diff)
downloadchef-9c7f3aefe2f9049f70808ed4f1ae83d0ff667807.tar.gz
Merge pull request #5404 from chef/omni
update omnibus branch sha to get new autoloading commit
-rw-r--r--omnibus/Gemfile.lock20
1 files changed, 10 insertions, 10 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 8976b06765..5d4febec32 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -17,7 +17,7 @@ GIT
GIT
remote: git://github.com/chef/omnibus.git
- revision: 98c9af20a0f79b6ac205613f509b4725eea47f7b
+ revision: f834133d8bb5e24776eca6ae835dcbaad11e0918
branch: rhass/COOL-502_with_gcc_investigate
specs:
omnibus (5.5.0)
@@ -38,12 +38,12 @@ GEM
addressable (2.4.0)
artifactory (2.5.0)
awesome_print (1.7.0)
- aws-sdk (2.6.3)
- aws-sdk-resources (= 2.6.3)
- aws-sdk-core (2.6.3)
+ aws-sdk (2.6.5)
+ aws-sdk-resources (= 2.6.5)
+ aws-sdk-core (2.6.5)
jmespath (~> 1.0)
- aws-sdk-resources (2.6.3)
- aws-sdk-core (= 2.6.3)
+ aws-sdk-resources (2.6.5)
+ aws-sdk-core (= 2.6.5)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -77,7 +77,7 @@ GEM
buff-shell_out (0.2.0)
buff-ruby_engine (~> 0.1.0)
builder (3.2.2)
- byebug (9.0.5)
+ byebug (9.0.6)
celluloid (0.16.0)
timers (~> 4.0.0)
celluloid-io (0.16.2)
@@ -127,7 +127,7 @@ GEM
mixlib-log
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
- mixlib-install (2.0.0)
+ mixlib-install (2.0.2)
artifactory
mixlib-shellout
mixlib-versioning
@@ -227,7 +227,7 @@ GEM
hashie (>= 2.0.2, < 4.0.0)
win32-process (0.8.3)
ffi (>= 1.0.0)
- winrm (2.0.2)
+ winrm (2.0.3)
builder (>= 2.1.2)
erubis (~> 2.7)
gssapi (~> 1.2)
@@ -262,4 +262,4 @@ DEPENDENCIES
winrm-fs (~> 1.0)
BUNDLED WITH
- 1.13.1
+ 1.12.5