[DRE-commits] [vagrant-lxc] 06/17: Merge tag 'upstream/1.1.0'

[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 4b9ce724bebeb1c321c4c6bb9485be6bcb7dc476
Merge: 145b8d9 2c47527
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Tue May 26 18:39:43 2015 -0300

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0
    
    # gpg: Signature made Ter 26 Mai 2015 18:39:39 BRT 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>"
    # gpg:                 aka "Antonio Terceiro <terceiro at cs.ubc.ca>"
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>"

 .travis.yml                                        |   4 +-
 BOXES.md                                           |  34 +--
 CHANGELOG.md                                       | 191 +++++++++++++
 CONTRIBUTING.md                                    |   7 +-
 Gemfile                                            |  25 +-
 Gemfile.lock                                       | 199 +++++++++-----
 README.md                                          | 141 ++++++----
 boxes/build-all.sh                                 |  22 --
 boxes/build-debian-box.sh                          | 167 ------------
 boxes/build-openmandriva-box.sh                    | 159 -----------
 boxes/build-ubuntu-box.sh                          | 151 -----------
 boxes/common/cleanup                               |   7 -
 boxes/common/install-babushka                      |  16 --
 boxes/common/install-chef                          |  15 --
 boxes/common/install-puppet                        |  13 -
 boxes/common/install-salt                          |  12 -
 boxes/common/install-salt-debian                   |  28 --
 boxes/common/lxc-template                          | 226 ----------------
 boxes/common/lxc-template-openmandriva             | 225 ----------------
 boxes/common/lxc.conf                              |  49 ----
 boxes/common/metadata.json                         |   5 -
 development/Vagrantfile                            |  94 -------
 development/lxc-configs/lxc-dev-box                |  37 ---
 development/lxc-configs/sid                        |  37 ---
 development/lxc-configs/squeeze                    |  37 ---
 development/lxc-configs/vbox                       |  37 ---
 development/lxc-configs/wheezy                     |  37 ---
 development/site.pp                                | 151 -----------
 lib/vagrant-lxc.rb                                 |  12 +
 lib/vagrant-lxc/action.rb                          | 135 ++++++----
 lib/vagrant-lxc/action/boot.rb                     |   9 +-
 lib/vagrant-lxc/action/check_created.rb            |  21 --
 lib/vagrant-lxc/action/check_running.rb            |  21 --
 lib/vagrant-lxc/action/clear_forwarded_ports.rb    |  13 +-
 lib/vagrant-lxc/action/create.rb                   |  24 +-
 lib/vagrant-lxc/action/created.rb                  |  20 --
 lib/vagrant-lxc/action/disconnect.rb               |  18 --
 .../action/fetch_ip_from_dnsmasq_leases.rb         |   3 +-
 lib/vagrant-lxc/action/fetch_ip_with_lxc_attach.rb |   2 +-
 lib/vagrant-lxc/action/forward_ports.rb            |   7 +-
 .../action/gc_private_network_bridges.rb           |  46 ++++
 lib/vagrant-lxc/action/handle_box_metadata.rb      |  50 +++-
 lib/vagrant-lxc/action/is_running.rb               |  19 --
 lib/vagrant-lxc/action/message.rb                  |  23 --
 lib/vagrant-lxc/action/prepare_nfs_settings.rb     |  64 +++++
 lib/vagrant-lxc/action/prepare_nfs_valid_ids.rb    |  19 ++
 lib/vagrant-lxc/action/private_networks.rb         |  43 +++
 lib/vagrant-lxc/action/setup_package_files.rb      |   8 +-
 lib/vagrant-lxc/action/share_folders.rb            |  67 -----
 lib/vagrant-lxc/action/wait_for_communicator.rb    |  41 ---
 lib/vagrant-lxc/action/warn_networks.rb            |   6 +-
 lib/vagrant-lxc/command/root.rb                    |  58 ++++
 lib/vagrant-lxc/command/sudoers.rb                 |  91 +++++++
 lib/vagrant-lxc/config.rb                          |  34 ++-
 lib/vagrant-lxc/driver.rb                          | 162 ++++++++---
 lib/vagrant-lxc/driver/cli.rb                      |  58 +++-
 lib/vagrant-lxc/errors.rb                          |   8 +
 lib/vagrant-lxc/plugin.rb                          |  21 +-
 lib/vagrant-lxc/provider.rb                        |  23 +-
 lib/vagrant-lxc/provider/cap/public_address.rb     |  17 ++
 lib/vagrant-lxc/sudo_wrapper.rb                    |  15 +-
 lib/vagrant-lxc/synced_folder.rb                   |  72 +++++
 lib/vagrant-lxc/version.rb                         |   2 +-
 locales/en.yml                                     |  28 +-
 metadata.yml                                       |  75 ++----
 scripts/lxc-template                               | 174 ++++++++++++
 scripts/pipework                                   | 298 +++++++++++++++++++++
 spec/acceptance/sanity_check_spec.rb               | 111 --------
 .../acceptance/support/acceptance_example_group.rb |  76 ------
 spec/acceptance/support/machine_ext.rb             |  12 -
 spec/acceptance/support/test_ui.rb                 |  22 --
 spec/acceptance_helper.rb                          |  21 --
 spec/spec_helper.rb                                |  22 +-
 spec/unit/action/clear_forwarded_ports_spec.rb     |   6 +-
 spec/unit/action/compress_rootfs_spec.rb           |  12 +-
 spec/unit/action/forward_ports_spec.rb             |  48 +++-
 spec/unit/action/handle_box_metadata_spec.rb       |  86 ++++--
 spec/unit/action/setup_package_files_spec.rb       |  40 ++-
 spec/unit/driver/cli_spec.rb                       | 184 +++++++++----
 spec/unit/driver_spec.rb                           | 211 +++++++++++----
 spec/unit/support/unit_example_group.rb            |  12 +-
 spec/unit_helper.rb                                |   6 +-
 tasks/spec.rake                                    |  29 +-
 templates/sudoers.rb.erb                           | 133 +++++++++
 vagrant-spec.config.rb                             |  24 ++
 85 files changed, 2428 insertions(+), 2560 deletions(-)

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