-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bring rubygems & bundler to be consistent with embedded ruby version
The version of rubygems and bundler must be consistent witht the version included in the embedded Ruby install or we'll get double-bundler problems. * versions overridden in the supermarket software definition * BUNDLED WITH updated in the Gemfile.locks * updated the omnibus and omnibus-software gems to have access to the new versions of components * berkshelf installed as a gem instead of as an omnibus software dependency because it installs from git with bundler and its Gemfile.lock is an older version of bundler that does not match the one this change uses * update the embedded chef-client to latest 14 - the ctl-reconfigure command provided by omnibus-ctl uses the --chef-license switch. Need to update to a version of 14 with that switch backported as a no-op or else supermarket-ctl reconfigure would fail with a message about an invalid option. Signed-off-by: Robb Kidd <rkidd@chef.io>
- Loading branch information
Showing
5 changed files
with
132 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.