diff --git a/lib/vagrant/downloaders/http.rb b/lib/vagrant/downloaders/http.rb index dc5be32d6..05a67c0d7 100644 --- a/lib/vagrant/downloaders/http.rb +++ b/lib/vagrant/downloaders/http.rb @@ -10,7 +10,6 @@ module Vagrant class HTTP < Base def self.match?(uri) # URI.parse barfs on ':\\files \on\ windows' - # TODO temprorary extracted = URI.extract(uri).first extracted && extracted.include?(uri) end diff --git a/lib/vagrant/provisioners/chef_server.rb b/lib/vagrant/provisioners/chef_server.rb index a4b1ee7f6..ed5f6c39c 100644 --- a/lib/vagrant/provisioners/chef_server.rb +++ b/lib/vagrant/provisioners/chef_server.rb @@ -53,8 +53,6 @@ module Vagrant logger.info "Running chef-client..." vm.ssh.execute do |ssh| ssh.exec!(command) do |channel, type, data| - # TODO: Very verbose. It would be easier to save the data and only show it during - # an error, or when verbosity level is set high if type == :exit_status ssh.check_exit_status(data, command) else diff --git a/lib/vagrant/provisioners/chef_solo.rb b/lib/vagrant/provisioners/chef_solo.rb index 1f0ff9264..0a12c0d8d 100644 --- a/lib/vagrant/provisioners/chef_solo.rb +++ b/lib/vagrant/provisioners/chef_solo.rb @@ -42,8 +42,6 @@ module Vagrant logger.info "Running chef-solo..." vm.ssh.execute do |ssh| ssh.exec!(command) do |channel, type, data| - # TODO: Very verbose. It would be easier to save the data and only show it during - # an error, or when verbosity level is set high ssh.check_exit_status(data, command) if type == :exit_status logger.info("#{data}: #{type}") if type != :exit_status end diff --git a/lib/vagrant/ssh.rb b/lib/vagrant/ssh.rb index 3757fa94c..3347bbdee 100644 --- a/lib/vagrant/ssh.rb +++ b/lib/vagrant/ssh.rb @@ -107,10 +107,9 @@ module Vagrant # Checks the file permissions for the private key, resetting them # if needed, or on failure erroring. def check_key_permissions(key_path) + # Windows systems don't have this issue return if Mario::Platform.windows? - # TODO: This only works on unix based systems for now. Windows - # systems will need to be investigated further. stat = File.stat(key_path) if stat.owned? && file_perms(key_path) != "600" diff --git a/lib/vagrant/version.rb b/lib/vagrant/version.rb index 635ad9f37..9c869935c 100644 --- a/lib/vagrant/version.rb +++ b/lib/vagrant/version.rb @@ -2,5 +2,5 @@ module Vagrant # This will always be up to date with the current version of Vagrant, # since it is used to generate the gemspec and is also the source of # the version for `vagrant -v` - VERSION = "0.4.3.dev" + VERSION = "0.5.0" end