Skip to content

Commit

Permalink
Release v1.3.10
Browse files Browse the repository at this point in the history
* master:
  Gemfile: Use Vagrant 1.7.2
  Removed redundant options for acceptance tests
  Version bumped to 1.3.10
  locales: Added string for status of paused VMs
  driver: Added hook for PD 11 beta
  • Loading branch information
legal90 committed Apr 20, 2015
2 parents 5148aae + 05e79f2 commit 916c48a
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ group :development do
# We depend on Vagrant for development, but we don't add it as a
# gem dependency because we expect to be installed within the
# Vagrant environment itself using `vagrant plugin`.
gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.1'
gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.2'
gem 'vagrant-spec', git: 'git://github.com/mitchellh/vagrant-spec.git'
end
9 changes: 5 additions & 4 deletions lib/vagrant-parallels/driver/meta.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@ def initialize(uuid=nil)
raise VagrantPlugins::Parallels::Errors::ParallelsNotDetected
end

# Instantiate the proper version driver for VirtualBox
# Instantiate the proper version driver for Parallels Desktop
@logger.debug("Finding driver for Parallels Desktop version: #{@version}")
driver_map = {
"8" => PD_8,
"9" => PD_9,
"10" => PD_10
'8' => PD_8,
'9' => PD_9,
'10' => PD_10,
'11' => PD_10
}

driver_klass = nil
Expand Down
2 changes: 1 addition & 1 deletion lib/vagrant-parallels/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module VagrantPlugins
module Parallels
VERSION = '1.3.9'
VERSION = '1.3.10'
end
end
5 changes: 5 additions & 0 deletions locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ en:
create the environment. If a machine is not created, only the
default provider will be shown. So if a provider is not listed,
then the machine is not created for that environment.
paused: |-
The VM is paused. This VM may have been paused via Parallels Desktop
GUI or the `prlctl` command line interface. To unpause, please
use the Parallels Desktop GUI and/or `prlctl` command line interface
so that vagrant would be able to control the VM again.
suspended: |-
The VM is suspended. To resume this VM you can run `vagrant resume`
or `vagrant up` to restart it again, so that vagrant would be able
Expand Down
3 changes: 1 addition & 2 deletions vagrant-spec.config.example.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@

c.provider 'parallels',
box: 'ENTER BOX URL',
contexts: ['provider-context/parallels'],
features: ['!network/forwarded_port', '!cli/plugin']
contexts: ['provider-context/parallels']
end

0 comments on commit 916c48a

Please sign in to comment.