[DRE-commits] [vagrant-libvirt] 130/163: Merge pull request #328 from epienbroek/master

[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 39837bbbaf8d68a2d16c0593e7ff6eaeac05eae3
Merge: 3f52dac ce75b9a
Author: Dmitry Vasilets <pronix.service at gmail.com>
Date:   Thu Apr 2 13:20:21 2015 +0200

    Merge pull request #328 from epienbroek/master
    
    Allow the situation where DHCP is not requested but where it is enabled on the virtual network

 README.md                                     | 6 ++++++
 lib/vagrant-libvirt/action/create_networks.rb | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

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