diff options
| author | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-01-22 13:21:51 -0500 |
|---|---|---|
| committer | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-01-22 13:21:51 -0500 |
| commit | 1cb9cc67b71d21d1207602d1ec50ad2d68486171 (patch) | |
| tree | 2dd04c13b604118b3d4941d592f3ff2ff77522ff | |
| parent | 5e7e11df8945d82bef23ccbd2b19cdafb18f3b50 (diff) | |
| parent | d4fbcab2a85a33d214f1401483cfa0f45e56299b (diff) | |
| download | chef-1cb9cc67b71d21d1207602d1ec50ad2d68486171.tar.gz | |
Merge pull request #4449 from chef/ksubrama/test
Bump omnibus lock pins and fix the solaris mapfile.
| -rw-r--r-- | omnibus/Gemfile.lock | 14 | ||||
| -rw-r--r-- | omnibus/files/mapfiles/solaris | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 9b6757287e..0f1423985e 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: git://github.com/chef/omnibus-software.git - revision: 5c7ad9dbcbf11aaa6326446ab4128ec23685c33d + revision: 56f4933c94cfcb85be7b3564ccab280769d90d12 specs: omnibus-software (4.0.0) GIT remote: git://github.com/chef/omnibus.git - revision: 88400e2feee1498e432b6c5f70707b14fb22e8c9 + revision: d66b7fcafd5f8fb55e974913999fd1b9db564f1e specs: omnibus (5.0.0) aws-sdk (~> 2) @@ -22,12 +22,12 @@ GEM remote: https://rubygems.org/ specs: addressable (2.3.8) - aws-sdk (2.2.10) - aws-sdk-resources (= 2.2.10) - aws-sdk-core (2.2.10) + aws-sdk (2.2.13) + aws-sdk-resources (= 2.2.13) + aws-sdk-core (2.2.13) jmespath (~> 1.0) - aws-sdk-resources (2.2.10) - aws-sdk-core (= 2.2.10) + aws-sdk-resources (2.2.13) + aws-sdk-core (= 2.2.13) berkshelf (3.2.4) addressable (~> 2.3.4) berkshelf-api-client (~> 1.2) diff --git a/omnibus/files/mapfiles/solaris b/omnibus/files/mapfiles/solaris index b33e54dcae..c0ca5c1ae3 100644 --- a/omnibus/files/mapfiles/solaris +++ b/omnibus/files/mapfiles/solaris @@ -8,7 +8,6 @@ DEPEND_VERSIONS libsocket.so { ALLOW = SUNWprivate_1.1; }; DEPEND_VERSIONS libdl.so { - ALLOW = SUNW_1.22.1; ALLOW = SUNW_1.4; ALLOW = SUNWprivate_1.1; }; |