[DRE-commits] [ruby-sidekiq] 10/10: Merge tag 'upstream/3.2.6_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 a19251c57923b98d926ca349ab639f0e8ed4b5c4
Merge: d93e9f6 ce96832
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Oct 21 20:17:01 2014 +0530

    Merge tag 'upstream/3.2.6_dfsg'
    
    Upstream version 3.2.6~dfsg
    
    # gpg: Signature made Tuesday 21 October 2014 08:16:53 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"

 .travis.yml                                        |   1 +
 Changes.md                                         |  31 +++++++++++++
 Pro-Changes.md                                     |  29 ++++++++++++
 README.md                                          |   3 +-
 checksums.yaml.gz                                  | Bin 271 -> 0 bytes
 lib/generators/sidekiq/templates/worker.rb.erb     |   9 ++++
 .../sidekiq/templates/worker_spec.rb.erb           |   6 +++
 .../sidekiq/templates/worker_test.rb.erb           |   8 ++++
 lib/generators/sidekiq/worker_generator.rb         |  49 +++++++++++++++++++++
 lib/sidekiq/api.rb                                 |  43 +++++++++++++-----
 lib/sidekiq/cli.rb                                 |   8 ++--
 lib/sidekiq/client.rb                              |  31 +++++++------
 lib/sidekiq/extensions/action_mailer.rb            |  17 ++++++-
 lib/sidekiq/launcher.rb                            |   3 +-
 lib/sidekiq/middleware/i18n.rb                     |   6 +++
 lib/sidekiq/middleware/server/retry_jobs.rb        |  33 +++++++++-----
 lib/sidekiq/processor.rb                           |   6 ++-
 lib/sidekiq/scheduled.rb                           |  23 +++++-----
 lib/sidekiq/testing.rb                             |   8 +++-
 lib/sidekiq/version.rb                             |   2 +-
 lib/sidekiq/web.rb                                 |   8 ++--
 lib/sidekiq/web_helpers.rb                         |   8 +++-
 metadata.yml                                       |  16 ++++---
 sidekiq.gemspec                                    |   2 +-
 test/test_api.rb                                   |   2 +-
 test/test_cli.rb                                   |  29 ++++++++++++
 test/test_client.rb                                |   8 +---
 test/test_manager.rb                               |   2 +-
 test/test_processor.rb                             |   6 +++
 test/test_retry.rb                                 |  18 ++++++++
 test/test_testing_fake.rb                          |   6 +++
 test/test_web.rb                                   |   4 +-
 .../{jquery.timeago.cz.js => jquery.timeago.cs.js} |   0
 web/assets/stylesheets/application.css             |   2 +
 web/views/busy.erb                                 |   5 ++-
 web/views/layout.erb                               |   2 +-
 36 files changed, 349 insertions(+), 85 deletions(-)

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