From 71b02ab51134c8813c2c5c14fb473b5fe8877f44 Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Wed, 12 Mar 2014 23:10:37 -0300 Subject: [PATCH] We dont need to provide support for all versions on the 1.1.x series ;) --- lib/vagrant-lxc/action.rb | 3 --- lib/vagrant-lxc/action/disconnect.rb | 18 ------------------ 2 files changed, 21 deletions(-) delete mode 100644 lib/vagrant-lxc/action/disconnect.rb diff --git a/lib/vagrant-lxc/action.rb b/lib/vagrant-lxc/action.rb index 4eb6ed5..5286718 100644 --- a/lib/vagrant-lxc/action.rb +++ b/lib/vagrant-lxc/action.rb @@ -6,7 +6,6 @@ require 'vagrant-lxc/action/create' require 'vagrant-lxc/action/created' require 'vagrant-lxc/action/destroy' require 'vagrant-lxc/action/destroy_confirm' -require 'vagrant-lxc/action/disconnect' require 'vagrant-lxc/action/compress_rootfs' require 'vagrant-lxc/action/fetch_ip_with_lxc_attach' require 'vagrant-lxc/action/fetch_ip_from_dnsmasq_leases' @@ -136,8 +135,6 @@ module Vagrant Builder.new.tap do |b| b.use Builtin::Call, Created do |env, b2| if env[:result] - # TODO: Remove once we drop support for vagrant 1.1 - b2.use Disconnect b2.use ClearForwardedPorts b2.use RemoveTemporaryFiles b2.use Builtin::Call, Builtin::GracefulHalt, :stopped, :running do |env2, b3| diff --git a/lib/vagrant-lxc/action/disconnect.rb b/lib/vagrant-lxc/action/disconnect.rb deleted file mode 100644 index 69aee10..0000000 --- a/lib/vagrant-lxc/action/disconnect.rb +++ /dev/null @@ -1,18 +0,0 @@ -module Vagrant - module LXC - module Action - class Disconnect - def initialize(app, env) - @app = app - end - - def call(env) - @app.call env - # FIXME: Vagrant >= 1.1.3 should not need this - # https://github.com/mitchellh/vagrant/compare/715539eac30bc9ae62ddbb6337d13f036f7b774d...ec1bae0#L2R128 - env[:machine].instance_variable_set(:@communicator, nil) - end - end - end - end -end