[DRE-commits] [vagrant-lxc] 01/04: Merge tag 'upstream/1.2.1'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository vagrant-lxc.

commit 151bf7453890f96083e437edb5af46c34d9e4592
Merge: 06f02b7 06e4952
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Thu Oct 22 10:08:05 2015 -0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1
    
    # gpg: Signature made Qui 22 Out 2015 10:08:04 BRST using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 CHANGELOG.md                                       |  32 ++++-
 Gemfile                                            |   2 +-
 Gemfile.lock                                       | 133 +++++++++------------
 README.md                                          |   5 +-
 lib/vagrant-lxc/action.rb                          |   2 -
 lib/vagrant-lxc/action/boot.rb                     |   9 ++
 lib/vagrant-lxc/action/forward_ports.rb            |   4 +-
 .../action/gc_private_network_bridges.rb           |   5 +-
 lib/vagrant-lxc/action/private_networks.rb         |   7 +-
 lib/vagrant-lxc/action/remove_temporary_files.rb   |  23 ----
 lib/vagrant-lxc/command/sudoers.rb                 |   1 +
 lib/vagrant-lxc/driver.rb                          | 112 ++++++++---------
 lib/vagrant-lxc/provider.rb                        |   2 +-
 lib/vagrant-lxc/sudo_wrapper.rb                    |   8 +-
 lib/vagrant-lxc/version.rb                         |   2 +-
 locales/en.yml                                     |   2 +-
 metadata.yml                                       |   7 +-
 scripts/lxc-template                               |   2 +-
 scripts/pipework                                   |   2 +-
 spec/unit/action/forward_ports_spec.rb             |  16 +--
 spec/unit/driver_spec.rb                           |  16 +--
 templates/sudoers.rb.erb                           |  12 +-
 22 files changed, 193 insertions(+), 211 deletions(-)

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