[DRE-commits] [ruby-passenger] 01/04: Merge tag 'upstream/4.0.52'

[Felix Geyer]

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

fgeyer pushed a commit to branch master
in repository ruby-passenger.

commit 6a302c88d2cfa2fafe0765b76c9ea3132a797509
Merge: 8d9c542 942ff6c
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Sep 28 23:35:41 2014 +0200

    Merge tag 'upstream/4.0.52'
    
    Upstream version 4.0.52
    
    # gpg: Signature made So 28 Sep 2014 23:35:39 CEST using RSA key ID 83135D45
    # gpg: Good signature from "Felix Geyer <felix at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx-pkg at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx at kubuntu.org>"
    # gpg:                 aka "Felix Geyer <debfx at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx at ubuntu.com>"
    # gpg:                 aka "Felix Geyer <felix.geyer at fobos.de>"
    # gpg:                 aka "Felix Geyer <fgeyer at debian.org>"

 CHANGELOG                                          |  13 +
 CONTRIBUTORS                                       |   3 +
 bin/passenger-install-apache2-module               |   3 +
 bin/passenger-install-nginx-module                 |  14 +-
 bin/passenger-memory-stats                         |  26 +-
 bin/passenger-status                               |   7 +-
 doc/Design and Architecture.html                   | 129 ++--
 doc/Security of user switching support.html        |  33 +-
 doc/Users guide Apache.html                        | 696 +++++++++---------
 doc/Users guide Apache.txt                         |   2 +-
 doc/Users guide Nginx.html                         | 782 +++++++++++----------
 doc/Users guide Nginx.idmap.txt                    |  10 +-
 doc/Users guide Nginx.txt                          |  10 +
 doc/Users guide Standalone.html                    | 406 +++++------
 doc/Users guide.html                               |  36 +-
 ext/common/ApplicationPool2/AppTypes.h             |   1 +
 ext/common/ApplicationPool2/Spawner.h              |  10 +
 ext/common/Constants.h                             |   2 +-
 ext/common/Logging.cpp                             |  11 +
 ext/common/Logging.h                               |  39 +-
 ext/common/Utils/SpeedMeter.h                      |  13 +-
 ext/common/agents/Base.cpp                         |   8 -
 helper-scripts/node-loader.js                      |  97 ++-
 lib/phusion_passenger.rb                           |   2 +-
 lib/phusion_passenger/abstract_installer.rb        |  66 +-
 lib/phusion_passenger/console_text_template.rb     |   9 +-
 .../platform_info/depcheck_specs/libs.rb           |   4 +-
 lib/phusion_passenger/standalone/app_finder.rb     |   9 +-
 lib/phusion_passenger/standalone/command.rb        |  14 +-
 lib/phusion_passenger/standalone/start_command.rb  |  18 +-
 lib/phusion_passenger/standalone/utils.rb          |  16 +-
 lib/phusion_passenger/utils/ansi_colors.rb         |  85 ++-
 test/integration_tests/standalone_tests.rb         |   6 +-
 33 files changed, 1481 insertions(+), 1099 deletions(-)

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