[DRE-commits] [vagrant-libvirt] 41/104: Merge branch 'master' of git://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.11
in repository vagrant-libvirt.

commit d0383d1f9926244962ba69d0ac0bca604979c9fd
Merge: 36b71b7 29daa53
Author: dima <pronix.service at gmail.com>
Date:   Tue May 14 01:19:35 2013 +0200

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

 CHANGELOG.md                                   |  9 ++++
 README.md                                      | 68 +++++++++++++++++++++-----
 lib/vagrant-libvirt/action.rb                  |  9 +---
 lib/vagrant-libvirt/action/cleanup_data_dir.rb | 22 ---------
 lib/vagrant-libvirt/action/create_networks.rb  | 10 +++-
 lib/vagrant-libvirt/version.rb                 |  2 +-
 6 files changed, 76 insertions(+), 44 deletions(-)

diff --cc lib/vagrant-libvirt/action.rb
index 7c7647b,6aff1bc..787f875
--- a/lib/vagrant-libvirt/action.rb
+++ b/lib/vagrant-libvirt/action.rb
@@@ -24,10 -24,7 +24,11 @@@ module VagrantPlugin
                b2.use TimedProvision
                b2.use CreateNetworks
                b2.use CreateNetworkInterfaces
 +
 +              b2.use NFS
 +              b2.use PrepareNFSSettings
 +              b2.use ShareFolders
+               b2.use SetHostname
                b2.use StartDomain
                b2.use WaitTillUp
                b2.use SyncFolders
@@@ -105,12 -100,8 +104,9 @@@
              end
  
              b2.use ConnectLibvirt
 +            b2.use PruneNFSExports
              b2.use DestroyDomain
              b2.use DestroyNetworks
- 
-             # Cleanup running instance data. Now only IP address is stored.
-             b2.use CleanupDataDir
            end
          end
        end

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