[DRE-commits] [ruby-foreman] 02/13: Merge tag 'upstream/0.82.0'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-foreman.

commit cc1ef5e499aa9614ce6debd88c0b00f5bd8d2df2
Merge: 89759d4 5b5b4b9
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Jul 18 19:07:38 2016 -0300

    Merge tag 'upstream/0.82.0'
    
    Upstream version 0.82.0
    
    # gpg: Signature made Seg 18 Jul 2016 19:07:35 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 <antonio.terceiro at linaro.org>"
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>"

 README.md                                          |  25 +---
 data/export/supervisord/app.conf.erb               |   6 +-
 data/export/systemd/master.target.erb              |   1 -
 data/export/systemd/process.service.erb            |   5 +-
 data/export/systemd/process_master.target.erb      |   3 +-
 foreman.gemspec                                    |  34 +++++
 lib/foreman/cli.rb                                 |  16 +-
 lib/foreman/engine.rb                              |  89 ++++++++---
 lib/foreman/export/base.rb                         |  11 ++
 lib/foreman/export/supervisord.rb                  |   2 +-
 lib/foreman/export/systemd.rb                      |  26 ++--
 lib/foreman/procfile.rb                            |   4 +-
 lib/foreman/version.rb                             |   2 +-
 man/foreman.1                                      |  16 +-
 metadata.yml                                       | 164 ---------------------
 spec/foreman/cli_spec.rb                           |   6 +-
 spec/foreman/engine_spec.rb                        |  18 ++-
 spec/foreman/export/supervisord_spec.rb            |   2 +
 spec/foreman/export/systemd_spec.rb                |  48 ++++--
 spec/foreman/procfile_spec.rb                      |   7 +
 spec/resources/Procfile.bad                        |   2 +
 spec/resources/export/supervisord/app-alpha-1.conf |   8 +-
 spec/resources/export/systemd/app-alpha.target     |   2 +
 .../app-alpha-1.service => app-alpha at .service}     |   5 +-
 spec/resources/export/systemd/app-bravo.target     |   2 +
 .../app-bravo-1.service => app-bravo at .service}     |   5 +-
 .../export/systemd/{standard => }/app.target       |   1 -
 .../export/systemd/concurrency/app-alpha-1.service |  14 --
 .../export/systemd/concurrency/app-alpha-2.service |  14 --
 .../export/systemd/concurrency/app-alpha.target    |   3 -
 .../export/systemd/concurrency/app.target          |   6 -
 .../export/systemd/standard/app-alpha.target       |   3 -
 .../export/systemd/standard/app-bravo.target       |   3 -
 spec/spec_helper.rb                                |  14 ++
 34 files changed, 255 insertions(+), 312 deletions(-)

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