Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404414 )
Change subject: Bump Vagrant gem version to the one used in Stretch ...................................................................... Bump Vagrant gem version to the one used in Stretch Debian stretch ships vagrant 1.9.1. Bump the tag from 1.8.1 to 1.9.1. Change-Id: Ia7f27fe5b01a3a2a40ad2aecd7cb4fcc25411a81 --- M Gemfile M Gemfile.lock 2 files changed, 33 insertions(+), 29 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/14/404414/1 diff --git a/Gemfile b/Gemfile index 0e63da2..2e65b76 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,11 @@ source 'https://rubygems.org' group :development do + # The versions should be kept in sync with the ones provided in Debian + # Upstream no more updates rubygems.org and we need a more recent version # https://github.com/mitchellh/vagrant/issues/5546 - gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.1' + gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.9.1' gem 'rubocop', '~> 0.51', require: false gem 'puppet', '~> 4.8.2' gem 'puppet-lint', '2.3.3' diff --git a/Gemfile.lock b/Gemfile.lock index 3aa9f13..1b2af54 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,25 @@ GIT remote: https://github.com/mitchellh/vagrant.git - revision: c1c00e2f3cf69c579a5aa6922d67bb838a2de9cd - tag: v1.8.1 + revision: d8c2b2e5ababcdecc65b62b91e5dec21a4bc2d96 + tag: v1.9.1 specs: - vagrant (1.8.1) - bundler (>= 1.5.2, <= 1.10.6) + vagrant (1.9.1) childprocess (~> 0.5.0) erubis (~> 2.7.0) hashicorp-checkpoint (~> 0.1.1) i18n (>= 0.6.0, <= 0.8.0) - listen (~> 3.0.2) + listen (~> 3.1.5) log4r (~> 1.1.9, < 1.1.11) net-scp (~> 1.1.0) net-sftp (~> 2.1) net-ssh (~> 3.0.1) - nokogiri (= 1.6.3.1) + nokogiri (= 1.6.7.1) rb-kqueue (~> 0.2.0) - rest-client (>= 1.6.0, < 2.0) + rest-client (>= 1.6.0, < 3.0) + ruby_dep (<= 1.3.1) wdm (~> 0.1.0) - winrm (~> 1.3) - winrm-fs (~> 0.2.2) + winrm (~> 1.6) + winrm-fs (~> 0.3.0) PATH remote: . @@ -66,18 +66,21 @@ httpclient (2.8.3) i18n (0.8.0) json_pure (1.8.6) - listen (3.0.8) + listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) little-plugger (1.1.4) log4r (1.1.10) - logging (1.8.2) - little-plugger (>= 1.1.3) - multi_json (>= 1.8.4) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) metaclass (0.0.4) method_source (0.9.0) - mime-types (2.99.3) - mini_portile (0.6.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.0.0) mocha (1.3.0) metaclass (~> 0.0.1) multi_json (1.12.2) @@ -88,8 +91,8 @@ net-ssh (>= 2.6.5) net-ssh (3.0.2) netrc (0.11.0) - nokogiri (1.6.3.1) - mini_portile (= 0.6.0) + nokogiri (1.6.7.1) + mini_portile2 (~> 2.0.0.rc2) nori (2.6.0) parallel (1.12.0) parser (2.4.0.2) @@ -124,10 +127,10 @@ ffi (>= 0.5.0, < 2) rb-kqueue (0.2.5) ffi (>= 0.5.0) - rest-client (1.8.0) + rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) rspec (3.7.0) rspec-core (~> 3.7.0) rspec-expectations (~> 3.7.0) @@ -151,29 +154,28 @@ ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.9.0) - rubyntlm (0.4.0) + ruby_dep (1.3.1) + rubyntlm (0.6.2) rubyzip (1.2.1) safe_yaml (1.0.4) unf (0.1.4) unf_ext unf_ext (0.0.7.4) unicode-display_width (1.3.0) - uuidtools (2.1.5) wdm (0.1.1) - winrm (1.3.6) + winrm (1.8.1) builder (>= 2.1.2) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) - rubyntlm (~> 0.4.0) - uuidtools (~> 2.1.2) - winrm-fs (0.2.3) + rubyntlm (~> 0.6.0) + winrm-fs (0.3.2) erubis (~> 2.7) - logging (~> 1.6, >= 1.6.1) + logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) - winrm (~> 1.3.0) + winrm (~> 1.5) yard (0.9.12) PLATFORMS -- To view, visit https://gerrit.wikimedia.org/r/404414 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7f27fe5b01a3a2a40ad2aecd7cb4fcc25411a81 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
