[DRE-commits] [vagrant-libvirt] 30/77: Merge branch 'virtfs' of github.com:teto/vagrant-libvirt into virtfs

[Antonio Terceiro]

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

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

commit 8d4f16a3f8d9e8c7b5fd2c4de8af6f47a1eea64c
Merge: 7ae9e03 aad1bd4
Author: Matthieu Coudron <mattator at gmail.com>
Date:   Sun Mar 16 11:38:21 2014 +0100

    Merge branch 'virtfs' of github.com:teto/vagrant-libvirt into virtfs

 lib/vagrant-libvirt/action.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --cc lib/vagrant-libvirt/action.rb
index b254fa4,8ac6682..a104219
--- a/lib/vagrant-libvirt/action.rb
+++ b/lib/vagrant-libvirt/action.rb
@@@ -27,14 -27,13 +27,18 @@@ module VagrantPlugin
                b2.use CreateNetworks
                b2.use CreateNetworkInterfaces
  
++
 +              b2.use PrepareNFSValidIds
                b2.use SyncedFolderCleanup
                b2.use SyncedFolders
  
                b2.use StartDomain
                b2.use WaitTillUp
  
 -              # b2.use PrepareNFSValidIds
++              b2.use StartDomain
++              b2.use WaitTillUp
++
 +              
  
  
                b2.use ForwardPorts
@@@ -73,8 -72,8 +77,7 @@@
                # Ensure networks are created and active
                b3.use CreateNetworks
  
--
 -              # b3.use PrepareNFSValidIds
 +              b3.use PrepareNFSValidIds
                b3.use SyncedFolderCleanup
                b3.use SyncedFolders
  
@@@ -318,8 -317,9 +321,11 @@@
        autoload :MessageNotCreated, action_root.join('message_not_created')
        autoload :MessageNotRunning, action_root.join('message_not_running')
        autoload :MessageNotSuspended, action_root.join('message_not_suspended')
 -      # autoload :PrepareNFSSettings, action_root.join('prepare_nfs_settings')
 -      # autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
 -      # autoload :PruneNFSExports, action_root.join('prune_nfs_exports')
++
 +      autoload :PrepareNFSSettings, action_root.join('prepare_nfs_settings')
++      autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
 +      autoload :PruneNFSExports, action_root.join('prune_nfs_exports')
++
        autoload :ReadSSHInfo, action_root.join('read_ssh_info')
        autoload :ReadState, action_root.join('read_state')
        autoload :ResumeDomain, action_root.join('resume_domain')
@@@ -329,10 -329,9 +335,11 @@@
        autoload :ShareFolders, action_root.join('share_folders')
        autoload :StartDomain, action_root.join('start_domain')
        autoload :SuspendDomain, action_root.join('suspend_domain')
 -      # autoload :SyncFolders, action_root.join('sync_folders')
        autoload :TimedProvision, action_root.join('timed_provision')
++
        autoload :WaitTillUp, action_root.join('wait_till_up')
 +      autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
 +
        autoload :SSHRun,  'vagrant/action/builtin/ssh_run'
        autoload :HandleBoxUrl, 'vagrant/action/builtin/handle_box_url'
        autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'

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