diff options
| author | Tyler Ball <tyler-ball@users.noreply.github.com> | 2016-01-07 13:12:09 -0800 |
|---|---|---|
| committer | Tyler Ball <tyler-ball@users.noreply.github.com> | 2016-01-07 13:12:09 -0800 |
| commit | e10bfefdd17c5d8f6b3f4517350cf10784b80742 (patch) | |
| tree | 78d16443200dfc5c9e76e1a8ea1f9561b5013301 | |
| parent | 11042288dac26ca2c632b44c6ce02a9cb99e4451 (diff) | |
| parent | ee687d05affda82e000e4767cc9b791f694f0506 (diff) | |
| download | chef-e10bfefdd17c5d8f6b3f4517350cf10784b80742.tar.gz | |
Merge pull request #576 from chef/tball/revert_ar
Reverting https://github.com/chef/omnibus/pull/583 to try and fix ChefDK build errors
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c9596a8d6b..4b959a6bd8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,7 +6,7 @@ GIT GIT remote: git://github.com/chef/omnibus.git - revision: f1231f74ebda76530e73fd6416e1ee7eb7be3656 + revision: b6422a3f9678a6f5cc145c9b0a488409ac0af73c specs: omnibus (5.0.0) aws-sdk (~> 2) @@ -74,7 +74,7 @@ GEM multipart-post (>= 1.2, < 3) ffi (1.9.10) ffi (1.9.10-x86-mingw32) - ffi-yajl (2.2.2) + ffi-yajl (2.2.3) libyajl2 (~> 1.2) gssapi (1.2.0) ffi (>= 1.0.1) @@ -198,3 +198,6 @@ DEPENDENCIES omnibus-software! test-kitchen (~> 1.4.0) winrm-transport (~> 1.0) + +BUNDLED WITH + 1.11.2 |