[DRE-commits] [ruby-foreman] 02/15: Merge tag 'upstream/0.77.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 56fa59e8d46531584fcdfdf8104ff3a070d63165
Merge: 243a9f9 8c18e2e
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Feb 4 12:54:28 2015 -0200

    Merge tag 'upstream/0.77.0'
    
    Upstream version 0.77.0
    
    # gpg: Signature made Qua 04 Fev 2015 12:54:25 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                                       | 340 ---------------------
 Gemfile                                            |  23 --
 Gemfile.lock                                       |  67 ----
 LICENSE                                            |  19 --
 README.md                                          |  20 +-
 Rakefile                                           |   8 -
 bin/taskman                                        |   8 -
 data/example/.profile.d/foo.sh                     |   2 -
 data/export/bluepill/master.pill.erb               |   2 +-
 data/export/daemon/master.conf.erb                 |  14 +
 data/export/daemon/process.conf.erb                |   8 +
 data/export/daemon/process_master.conf.erb         |   2 +
 data/export/runit/log/run.erb                      |   2 +-
 data/export/runit/run.erb                          |   1 +
 data/export/supervisord/app.conf.erb               |  11 +-
 data/export/systemd/master.target.erb              |   6 +
 data/export/systemd/process.service.erb            |  15 +
 data/export/systemd/process_master.target.erb      |   3 +
 data/export/upstart/master.conf.erb                |  12 +-
 data/export/upstart/process.conf.erb               |  11 +-
 dist/deb.rake                                      |  33 --
 dist/gem.rake                                      |  14 -
 dist/jruby.rake                                    |  16 -
 dist/mingw32.rake                                  |  16 -
 dist/pkg.rake                                      |  53 ----
 dist/resources/deb/control                         |  12 -
 dist/resources/deb/foreman                         |  18 --
 dist/resources/deb/heroku-release-key.txt          |  30 --
 dist/resources/deb/postinst                        |   3 -
 dist/resources/pkg/Distribution.erb                |  23 --
 dist/resources/pkg/PackageInfo.erb                 |   6 -
 dist/resources/pkg/foreman                         |  15 -
 dist/resources/pkg/postinstall                     |   2 -
 dist/resources/tgz/foreman                         |  15 -
 dist/tgz.rake                                      |  24 --
 foreman.gemspec                                    |  31 --
 lib/foreman.rb                                     |   6 -
 lib/foreman/capistrano.rb                          |  54 ----
 lib/foreman/cli.rb                                 |   5 +
 lib/foreman/engine.rb                              |  59 ++--
 lib/foreman/export.rb                              |   2 +
 lib/foreman/export/base.rb                         |  14 +-
 lib/foreman/export/daemon.rb                       |  28 ++
 lib/foreman/export/launchd.rb                      |   7 +-
 lib/foreman/export/systemd.rb                      |  32 ++
 lib/foreman/export/upstart.rb                      |  30 +-
 lib/foreman/process.rb                             |  55 +---
 lib/foreman/version.rb                             |   2 +-
 man/foreman.1                                      |  38 ++-
 man/foreman.1.ronn                                 | 175 -----------
 metadata.yml                                       | 177 +++++++++++
 spec/foreman/cli_spec.rb                           |  41 +--
 spec/foreman/engine_spec.rb                        |  26 +-
 spec/foreman/export/base_spec.rb                   |   2 +-
 spec/foreman/export/bluepill_spec.rb               |   4 +-
 spec/foreman/export/daemon_spec.rb                 |  97 ++++++
 spec/foreman/export/inittab_spec.rb                |   4 +-
 spec/foreman/export/launchd_spec.rb                |   6 +-
 spec/foreman/export/runit_spec.rb                  |  24 +-
 spec/foreman/export/supervisord_spec.rb            |   4 +-
 spec/foreman/export/systemd_spec.rb                |  91 ++++++
 spec/foreman/export/upstart_spec.rb                |  42 ++-
 spec/foreman/helpers_spec.rb                       |   8 +-
 spec/foreman/process_spec.rb                       |  35 ++-
 spec/foreman/procfile_spec.rb                      |  18 +-
 spec/foreman_spec.rb                               |   2 +-
 spec/helper_spec.rb                                |   5 +-
 spec/resources/.env                                |   1 -
 spec/resources/Procfile                            |   1 +
 .../resources/export/bluepill/app-concurrency.pill |   4 +-
 spec/resources/export/bluepill/app.pill            |   8 +-
 spec/resources/export/daemon/app-alpha-1.conf      |   7 +
 spec/resources/export/daemon/app-alpha-2.conf      |   7 +
 spec/resources/export/daemon/app-alpha.conf        |   2 +
 spec/resources/export/daemon/app-bravo-1.conf      |   7 +
 spec/resources/export/daemon/app-bravo.conf        |   2 +
 spec/resources/export/{upstart => daemon}/app.conf |   6 +-
 spec/resources/export/runit/app-alpha-1/log/run    |   2 +-
 spec/resources/export/runit/app-alpha-1/run        |   1 +
 spec/resources/export/runit/app-alpha-2/log/run    |   2 +-
 spec/resources/export/runit/app-alpha-2/run        |   1 +
 spec/resources/export/runit/app-bravo-1/log/run    |   2 +-
 spec/resources/export/runit/app-bravo-1/run        |   1 +
 spec/resources/export/supervisord/app-alpha-1.conf |  12 +-
 spec/resources/export/supervisord/app-alpha-2.conf |   6 +-
 .../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-1.service    |  14 +
 .../export/systemd/standard/app-alpha.target       |   3 +
 .../export/systemd/standard/app-bravo-1.service    |  14 +
 .../export/systemd/standard/app-bravo.target       |   3 +
 spec/resources/export/systemd/standard/app.target  |   6 +
 spec/resources/export/upstart/app-alpha-1.conf     |   8 +-
 spec/resources/export/upstart/app-alpha-2.conf     |   8 +-
 spec/resources/export/upstart/app-bravo-1.conf     |   8 +-
 spec/resources/export/upstart/app.conf             |  12 +-
 spec/spec_helper.rb                                |  19 +-
 tasks/dist.rake                                    | 112 -------
 tasks/release.rake                                 |  65 ----
 tasks/rspec.rake                                   |   8 -
 102 files changed, 934 insertions(+), 1433 deletions(-)

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