[DRE-commits] [ruby-sidekiq] 02/07: Merge tag 'upstream/3.4.2_dfsg'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-sidekiq.

commit 8febf173d3adab272b4c70f6b182f73942d2fded
Merge: e0d9ad1 579c96c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jul 30 19:54:40 2015 +0530

    Merge tag 'upstream/3.4.2_dfsg'
    
    Upstream version 3.4.2~dfsg
    
    # gpg: Signature made Thursday 30 July 2015 07:54:33 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 3.0-Upgrade.md                          |   2 +-
 Changes.md                              |  38 ++++++++-
 Gemfile                                 |   6 +-
 Pro-2.0-Upgrade.md                      |   4 +-
 Pro-Changes.md                          |  26 ++++++-
 README.md                               |   1 -
 bin/sidekiq                             |   5 ++
 lib/sidekiq.rb                          |  22 +++++-
 lib/sidekiq/api.rb                      |  14 ++--
 lib/sidekiq/cli.rb                      |   8 +-
 lib/sidekiq/client.rb                   |  15 ++--
 lib/sidekiq/exception_handler.rb        |   2 +-
 lib/sidekiq/fetch.rb                    |   2 +-
 lib/sidekiq/logging.rb                  |   8 +-
 lib/sidekiq/manager.rb                  |  24 +++---
 lib/sidekiq/processor.rb                |   8 +-
 lib/sidekiq/scheduled.rb                |  36 +++++----
 lib/sidekiq/testing.rb                  |   2 +
 lib/sidekiq/util.rb                     |  19 ++++-
 lib/sidekiq/version.rb                  |   2 +-
 lib/sidekiq/web.rb                      |   8 +-
 lib/sidekiq/web_helpers.rb              |  22 +++++-
 lib/sidekiq/worker.rb                   |   2 +
 metadata.yml                            | 105 +++++++++++++++----------
 sidekiq.gemspec                         |  22 +++---
 test/helper.rb                          |  25 ++++--
 test/test_api.rb                        |   6 ++
 test/test_cli.rb                        |  24 ++++++
 test/test_manager.rb                    |   4 +-
 test/test_rails.rb                      |  23 ++++++
 test/test_retry.rb                      |  27 +++++--
 test/test_scheduled.rb                  |  64 +++++++++++----
 test/test_scheduling.rb                 |   9 +++
 test/test_sidekiq.rb                    |  20 ++++-
 test/test_util.rb                       |  18 +++++
 test/test_web.rb                        |   8 +-
 test/test_web_helpers.rb                |   6 ++
 test/test_worker_generator.rb           |  17 ----
 web/assets/stylesheets/application.css  |  42 ++++++++--
 web/views/_job_info.erb                 | 134 ++++++++++++++++----------------
 web/views/_nav.erb                      |   5 +-
 web/views/_poll_js.erb                  |   5 ++
 web/views/{_poll.erb => _poll_link.erb} |   3 -
 web/views/busy.erb                      | 130 ++++++++++++++++---------------
 web/views/dead.erb                      |  40 +++++-----
 web/views/layout.erb                    |   1 +
 web/views/morgue.erb                    |  81 ++++++++++---------
 web/views/queue.erb                     |  61 ++++++++-------
 web/views/queues.erb                    |  49 ++++++------
 web/views/retries.erb                   |  85 ++++++++++----------
 web/views/retry.erb                     |  40 +++++-----
 web/views/scheduled.erb                 |  63 ++++++++-------
 web/views/scheduled_job_info.erb        |   1 +
 53 files changed, 895 insertions(+), 499 deletions(-)

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