From 45caeb3f92f8a1e9d6f7414f58b30b553e10a7b5 Mon Sep 17 00:00:00 2001 From: Michael Brandt Date: Wed, 6 Dec 2017 09:08:59 -0700 Subject: [PATCH] use rbvmomi at v1.11.5 and greater v1.11.5 fixes the issue introduced in v1.11.4 https://github.com/vmware/rbvmomi/issues/127#issuecomment-349557973 --- .bumpversion.cfg | 2 +- CHANGELOG.md | 7 ++++++- README.md | 4 ++-- lib/vSphere/version.rb | 2 +- vSphere.gemspec | 7 +------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5f25083e..af98fc24 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.13.1 +current_version = 1.13.2 tag = true commit = true diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c724eb3..9c08a1a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ -## [1.13.1 (2017-12-05)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.13.0) +## [1.13.2 (2017-12-06)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.13.2) + + - Update rbvmomi dependency to v1.11.5 and greater (but still less than + 2.0). v1.11.5 fixes the issue introduced in v1.11.4. + +## [1.13.1 (2017-12-05)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.13.1) - Update rbvmomi dependency to avoid v1.11.4; something in [2725089](https://github.com/vmware/rbvmomi/commit/2725089a08312315c4eb85f13296fc159f50b4d1) diff --git a/README.md b/README.md index bad235b2..900d7ffe 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,9 @@ This provider is built on top of the * libxml2, libxml2-dev, libxslt, libxslt-dev ## Current Version -**version: 1.13.1** +**version: 1.13.2** -vagrant-vsphere (**version: 1.13.1**) is available from +vagrant-vsphere (**version: 1.13.2**) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere) ## Installation diff --git a/lib/vSphere/version.rb b/lib/vSphere/version.rb index 506ccfdf..b69af9ad 100644 --- a/lib/vSphere/version.rb +++ b/lib/vSphere/version.rb @@ -1,5 +1,5 @@ module VagrantPlugins module VSphere - VERSION = '1.13.1' + VERSION = '1.13.2' end end diff --git a/vSphere.gemspec b/vSphere.gemspec index 4b0cefa6..bf137b31 100644 --- a/vSphere.gemspec +++ b/vSphere.gemspec @@ -14,12 +14,7 @@ Gem::Specification.new do |s| # force the use of Nokogiri 1.5.x to prevent conflicts with older versions of zlib s.add_dependency 'nokogiri', '~>1.5' - # force the use of at least rbvmomi 1.8.2 to work around concurrency errors: - # https://github.com/nsidc/vagrant-vsphere/issues/139 - # - # rbvmomi v1.11.4 broke cloning VMs at NSIDC, see - # https://github.com/vmware/rbvmomi/issues/127 - s.add_dependency 'rbvmomi', '>=1.8.2', '<1.11.4' + s.add_dependency 'rbvmomi', '>=1.11.5', '<2.0.0' s.add_dependency 'i18n', '>=0.6.4', '<=0.8.0'