Skip to content

Commit

Permalink
Merge pull request nsidc#206 from nsidc/fix-dep-issue
Browse files Browse the repository at this point in the history
Fix dependency issue; allow rbvmomi 1.9.x
  • Loading branch information
michaeljb authored Oct 17, 2016
2 parents ae3845e + 0f96c33 commit 61b413b
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.10.0
current_version = 1.10.1
tag = true
commit = true

Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [1.10.1 (2016-10-17)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.10.1)

- Update dependency on [rbvmomi](https://github.com/vmware/rbvmomi) to allow
versions greater than `1.8.2`, but still less than `2.0.0`. The previous
version constraint was intended to get at least `1.8.2`, but was also
restricting it to less than `1.9.0`.

## [1.10.0 (2016-05-17)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.10.0)

- Add support for `vagrant snapshot` and its subcommands
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ This provider is built on top of the
* libxml2, libxml2-dev, libxslt, libxslt-dev

## Current Version
**version: 1.10.0**
**version: 1.10.1**

vagrant-vsphere (**version: 1.10.0**) is available from
vagrant-vsphere (**version: 1.10.1**) is available from
[RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)

## Installation
Expand Down Expand Up @@ -148,7 +148,7 @@ This provider has the following settings, all are required unless noted:
* `real_nic_ip` - _Optional_ true/false - Enable logic that forces the acquisition of the ssh IP address
for a target VM to be retrieved from the list of vm adapters on the host and filtered for a single legitimate
adapter with a defined interface. An error will be raised if this filter is enabled and multiple valid
adapters exist on a host.
adapters exist on a host.

### Cloning from a VM rather than a template

Expand Down
2 changes: 1 addition & 1 deletion lib/vSphere/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module VagrantPlugins
module VSphere
VERSION = '1.10.0'
VERSION = '1.10.1'
end
end
5 changes: 3 additions & 2 deletions vSphere.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ 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 rbvmomi 1.8.2 to work around concurrency errors: https://github.com/nsidc/vagrant-vsphere/issues/139
s.add_dependency 'rbvmomi', '~> 1.8.2'
# force the use of at least rbvmomi 1.8.2 to work around concurrency errors:
# https://github.com/nsidc/vagrant-vsphere/issues/139
s.add_dependency 'rbvmomi', '>=1.8.2', '<2.0.0'
s.add_dependency 'i18n', '>= 0.6.4', '< 0.8.0'

s.add_development_dependency 'rake'
Expand Down

0 comments on commit 61b413b

Please sign in to comment.