[DRE-commits] [vagrant-libvirt] 09/104: Merge pull request #9 from pronix/master

[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 1069816a75a25722bf2bb408525b5789cfd905af
Merge: 268ff99 0a66fd2
Author: pradels <les.pradels at gmail.com>
Date:   Sun Mar 31 09:52:34 2013 -0700

    Merge pull request #9 from pronix/master
    
    pause <-> resume

 lib/vagrant-libvirt/action.rb                           | 17 +++++++++++++++++
 lib/vagrant-libvirt/action/destroy_domain.rb            |  2 +-
 lib/vagrant-libvirt/action/handle_box_image.rb          |  4 ++--
 lib/vagrant-libvirt/action/read_state.rb                |  1 -
 lib/vagrant-libvirt/action/start_domain.rb              |  6 +++++-
 .../action/{start_domain.rb => suspend.rb}              | 16 +++++++---------
 locales/en.yml                                          |  4 ++++
 7 files changed, 36 insertions(+), 14 deletions(-)

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