From d154aafc0d7d8b9e4fe9242ab1c4ad313afa13ad Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 29 Aug 2013 17:08:49 -0700 Subject: [PATCH] provisioners/salt: remove vagrant check, we core now --- plugins/provisioners/salt/plugin.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/plugins/provisioners/salt/plugin.rb b/plugins/provisioners/salt/plugin.rb index 222f11750..77f52b716 100644 --- a/plugins/provisioners/salt/plugin.rb +++ b/plugins/provisioners/salt/plugin.rb @@ -1,12 +1,4 @@ -begin - require "vagrant" -rescue LoadError - raise "The Vagrant Salt plugin must be run within Vagrant." -end - -if Vagrant::VERSION < "1.1.0" - raise "Please install vagrant-salt gem <=0.3.4 for Vagrant < 1.1.0" -end +require "vagrant" module VagrantPlugins module Salt @@ -25,7 +17,6 @@ module VagrantPlugins require File.expand_path("../provisioner", __FILE__) Provisioner end - end end -end \ No newline at end of file +end