[DRE-commits] [vagrant-libvirt] 131/163: Merge branch 'bug/multiple-disks-in-different-provider-calls'

[Antonio Terceiro]

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

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

commit 348e66d6f3b9a5fb7d770bb5406cc0547605e8d5
Merge: 39837bb ea5d474
Author: dima <pronix.service at gmail.com>
Date:   Thu Apr 2 13:30:07 2015 +0200

    Merge branch 'bug/multiple-disks-in-different-provider-calls'
    
    Conflicts:
    	lib/vagrant-libvirt/config.rb

 lib/vagrant-libvirt/config.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --cc lib/vagrant-libvirt/config.rb
index 1631172,b03d019..a27921b
--- a/lib/vagrant-libvirt/config.rb
+++ b/lib/vagrant-libvirt/config.rb
@@@ -108,10 -105,9 +108,10 @@@ module VagrantPlugin
          @graphics_passwd   = UNSET_VALUE
          @video_type        = UNSET_VALUE
          @video_vram        = UNSET_VALUE
 +        @keymap            = UNSET_VALUE
  
          # Storage
-         @disks             = UNSET_VALUE
+         @disks             = []
        end
  
        def _get_device(disks)

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