Permalink
Browse files

Merge branch 'master' of git://github.com/jedi4ever/veewee into kvm-w…

…indows

Conflicts:
	doc/kvm.md
  • Loading branch information...
1 parent de8b1a7 commit e02050db21604aeb9ef6b94a28bbd5ad33321d07 @ffeldhaus committed Jan 10, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/veewee/version.rb
  2. +1 −1 templates/archlinux-x86_64-netboot/definition.rb
View
@@ -4,5 +4,5 @@ module Veewee
# Only set the version constant if it wasn't set before
unless defined?(Veewee::VERSION)
- ::Veewee::VERSION="0.3.6"
+ ::Veewee::VERSION="0.3.7"
end
@@ -15,7 +15,7 @@
'vagrant<Enter>',
'vagrant<Enter>',
'/etc/rc.d/sshd start<Enter><Wait>',
- 'sleep 3 && wget 10.0.2.2:7122/aif.cfg<Enter>',
+ 'sleep 10 && wget 10.0.2.2:7122/aif.cfg<Enter>',
],
:kickstart_port => "7122", :kickstart_timeout => "10000", :kickstart_file => "aif.cfg",
:ssh_login_timeout => "10000", :ssh_user => "root", :ssh_password => "vagrant", :ssh_key => "",

0 comments on commit e02050d

Please sign in to comment.