[DRE-commits] [vagrant-libvirt] 21/67: Merge branch 'master' of github.com:pradels/vagrant-libvirt

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.14
in repository vagrant-libvirt.

commit 3917161eb9ec868515111e7028a43e958fedadcf
Merge: 81abafd 0984db2
Author: dima <pronix.service at gmail.com>
Date:   Tue Dec 3 21:13:34 2013 +0100

    Merge branch 'master' of github.com:pradels/vagrant-libvirt
    
    Conflicts:
    	lib/vagrant-libvirt/config.rb

 README.md                                               | 6 ++++--
 example_box/README.md                                   | 6 ++++++
 lib/vagrant-libvirt/action.rb                           | 4 ++++
 lib/vagrant-libvirt/action/connect_libvirt.rb           | 9 ++++++---
 lib/vagrant-libvirt/action/create_network_interfaces.rb | 3 ++-
 lib/vagrant-libvirt/action/read_ssh_info.rb             | 2 ++
 lib/vagrant-libvirt/action/sync_folders.rb              | 3 ++-
 lib/vagrant-libvirt/config.rb                           | 9 +++++++++
 lib/vagrant-libvirt/errors.rb                           | 6 +++---
 9 files changed, 38 insertions(+), 10 deletions(-)

diff --cc lib/vagrant-libvirt/config.rb
index 0b54d99,71e426d..4f91aa5
--- a/lib/vagrant-libvirt/config.rb
+++ b/lib/vagrant-libvirt/config.rb
@@@ -49,8 -57,9 +57,9 @@@ module VagrantPlugin
          @connect_via_ssh = false if @connect_via_ssh == UNSET_VALUE
          @username = nil if @username == UNSET_VALUE
          @password = nil if @password == UNSET_VALUE
 -        @id_ssh_key_file = nil if @id_ssh_key_file == UNSET_VALUE
 +        @id_ssh_key_file = 'id_rsa' if @id_ssh_key_file == UNSET_VALUE
          @storage_pool_name = 'default' if @storage_pool_name == UNSET_VALUE
+         @default_network = 'default' if @default_network == UNSET_VALUE
  
          # Domain specific settings.
          @memory = 512 if @memory == UNSET_VALUE

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git