[DRE-commits] [ruby-sidekiq] 01/03: Merge tag 'upstream/4.0.1+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 df0e8c8a6ee363ae06a0e37499b26452d5774fbf
Merge: dde7acb 34c58b8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Dec 23 18:30:26 2015 +0530

    Merge tag 'upstream/4.0.1+dfsg'
    
    Upstream version 4.0.1+dfsg
    
    # gpg: Signature made Wednesday 23 December 2015 06:30:16 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>"

 4.0-Upgrade.md                                     |  40 ++
 COMM-LICENSE                                       | 100 +--
 Changes.md                                         |  59 +-
 Ent-Changes.md                                     |  66 ++
 Gemfile                                            |   4 +-
 Pro-3.0-Upgrade.md                                 |  46 ++
 Pro-Changes.md                                     |  60 +-
 README.md                                          |  16 +-
 bin/sidekiqctl                                     |  10 +-
 bin/sidekiqload                                    | 167 +++++
 lib/sidekiq.rb                                     |  51 +-
 lib/sidekiq/actor.rb                               |  39 -
 lib/sidekiq/api.rb                                 |  52 +-
 lib/sidekiq/cli.rb                                 |  83 ++-
 lib/sidekiq/client.rb                              |   8 +-
 lib/sidekiq/fetch.rb                               | 146 +---
 lib/sidekiq/launcher.rb                            | 144 ++--
 lib/sidekiq/manager.rb                             | 258 ++-----
 lib/sidekiq/middleware/server/logging.rb           |  15 +-
 lib/sidekiq/middleware/server/retry_jobs.rb        |  10 +-
 lib/sidekiq/processor.rb                           | 223 +++---
 lib/sidekiq/redis_connection.rb                    |  28 +-
 lib/sidekiq/scheduled.rb                           |  73 +-
 lib/sidekiq/testing.rb                             |  19 +-
 lib/sidekiq/util.rb                                |   7 +
 lib/sidekiq/version.rb                             |   2 +-
 lib/sidekiq/web.rb                                 |  14 +
 lib/sidekiq/web_helpers.rb                         |   9 +-
 lib/sidekiq/worker.rb                              |  12 +
 metadata.yml                                       |  59 +-
 sidekiq.gemspec                                    |   4 +-
 test/helper.rb                                     |  34 +-
 test/test_actors.rb                                | 137 ++++
 test/test_api.rb                                   | 782 ++++++++++-----------
 test/test_cli.rb                                   |  64 +-
 test/test_client.rb                                | 195 ++---
 test/test_extensions.rb                            |  52 +-
 test/test_fetch.rb                                 |  59 +-
 test/test_launcher.rb                              |  80 +++
 test/test_logging.rb                               |   2 +-
 test/test_manager.rb                               | 147 +---
 test/test_middleware.rb                            |   8 +-
 test/test_processor.rb                             | 186 +++--
 test/test_rails.rb                                 |   2 -
 test/test_redis_connection.rb                      |   1 -
 test/test_retry.rb                                 | 277 +++-----
 test/test_scheduled.rb                             |  24 +-
 test/test_scheduling.rb                            |  62 +-
 test/test_sidekiq.rb                               |  48 +-
 test/test_testing.rb                               | 100 ++-
 test/test_testing_fake.rb                          |  11 +-
 test/test_testing_inline.rb                        |   6 +-
 test/test_util.rb                                  |   2 -
 test/test_web.rb                                   |  12 +-
 test/test_web_helpers.rb                           |   5 +-
 web/assets/images/favicon.ico                      | Bin 0 -> 5430 bytes
 .../javascripts/locales/jquery.timeago.pt-br.js    |  28 +-
 web/assets/stylesheets/application.css             |  83 +--
 web/locales/de.yml                                 |   2 +-
 web/locales/en.yml                                 |   1 +
 web/locales/{no.yml => nb.yml}                     |  12 +-
 web/locales/uk.yml                                 |  76 ++
 web/views/_footer.erb                              |   9 +-
 web/views/_job_info.erb                            |   2 +-
 web/views/busy.erb                                 |   1 -
 web/views/layout.erb                               |   1 +
 66 files changed, 2393 insertions(+), 1942 deletions(-)

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