[DRE-commits] [vagrant-libvirt] 82/163: Merge branch 'master' into bp-disk-path

[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 086f66dcb2cc10f225887f590c9c3bf6138e671c
Merge: 8f6e232 9e0f0de
Author: Brian Pitts <brian at polibyte.com>
Date:   Mon Nov 17 21:21:06 2014 -0600

    Merge branch 'master' into bp-disk-path

 README.md                                    |  2 ++
 lib/vagrant-libvirt.rb                       | 10 ----------
 lib/vagrant-libvirt/action/forward_ports.rb  | 15 ++++++++++++++-
 lib/vagrant-libvirt/config.rb                |  5 +++--
 lib/vagrant-libvirt/templates/domain.xml.erb |  4 ++--
 vagrant-libvirt.gemspec                      | 14 +++++++-------
 6 files changed, 28 insertions(+), 22 deletions(-)

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