Skip to content
Browse files

revert boxes to original commented-in/out state, add TODO for removin…

…g vagrant patch
  • Loading branch information...
1 parent 9572c94 commit 49b800dab591dee8fd49efd4bec9bfeb35ae7a95 Elad Rosenheim committed Jan 21, 2013
Showing with 8 additions and 6 deletions.
  1. +5 −5 Vagrantfile
  2. +3 −1 vagrant_patches.rb
View
10 Vagrantfile
@@ -13,12 +13,12 @@ end
build_boxes = {
- #:centos_5_64 => 'http://vagrant.sensuapp.org/centos-5-x86_64.box',
- #:centos_5_32 => 'http://vagrant.sensuapp.org/centos-5-i386.box',
+ :centos_5_64 => 'http://vagrant.sensuapp.org/centos-5-x86_64.box',
+ :centos_5_32 => 'http://vagrant.sensuapp.org/centos-5-i386.box',
# :centos_6_64 => 'http://vagrant.sensuapp.org/centos-6-x86_64.box',
# :centos_6_32 => 'http://vagrant.sensuapp.org/centos-6-i386.box',
- #:ubuntu_1004_32 => 'http://vagrant.sensuapp.org/ubuntu-1004-i386.box',
- #:ubuntu_1004_64 => 'http://vagrant.sensuapp.org/ubuntu-1004-amd64.box',
+ :ubuntu_1004_32 => 'http://vagrant.sensuapp.org/ubuntu-1004-i386.box',
+ :ubuntu_1004_64 => 'http://vagrant.sensuapp.org/ubuntu-1004-amd64.box',
# :ubuntu_1104_32 => 'http://vagrant.sensuapp.org/ubuntu-1104-i386.box',
# :ubuntu_1104_64 => 'http://vagrant.sensuapp.org/ubuntu-1104-amd64.box',
# :ubuntu_1110_32 => 'http://vagrant.sensuapp.org/ubuntu-1110-i386.box',
@@ -28,7 +28,7 @@ build_boxes = {
# :debian_5_32 => '',
# :debian_5_64 => '',
# :opensuse_1201_64 => '',
- :sles_11sp2_64 => ''
+ # :sles_11sp2_64 => ''
}
Vagrant::Config.run do |vagrant|
View
4 vagrant_patches.rb
@@ -1,7 +1,9 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
-# See: https://github.com/mitchellh/vagrant/pull/1283, hopefully integrated in 1.1.0
+# TODO remove this patch after Vagrant v1.1.0 is released - it should have a similar patch
+# (see https://github.com/mitchellh/vagrant/pull/1283)
+
if Gem::Version.new(Vagrant::VERSION) < Gem::Version.new('1.1.0')
module Vagrant

0 comments on commit 49b800d

Please sign in to comment.
Something went wrong with that request. Please try again.