[DRE-commits] [ruby-sidekiq] 01/02: Merge tag 'upstream/3.3.0_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 54259fa0f6871ec482613a3b895fd42977562e39
Merge: a19251c 73c24ab
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Nov 29 23:51:05 2014 +0530

    Merge tag 'upstream/3.3.0_dfsg'
    
    Upstream version 3.3.0~dfsg
    
    # gpg: Signature made Saturday 29 November 2014 11:50:58 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>"

 .gitignore                                 |  1 +
 .travis.yml                                |  6 ++++++
 Changes.md                                 | 11 +++++++++--
 Gemfile                                    |  4 ++++
 lib/generators/sidekiq/worker_generator.rb |  4 ++--
 lib/sidekiq/cli.rb                         |  6 +++---
 lib/sidekiq/launcher.rb                    |  8 +++++---
 lib/sidekiq/manager.rb                     | 11 ++++-------
 lib/sidekiq/middleware/chain.rb            |  5 +++++
 lib/sidekiq/version.rb                     |  2 +-
 metadata.yml                               | 14 ++++++++------
 sidekiq.gemspec                            |  2 +-
 test/helper.rb                             |  2 +-
 test/test_cli.rb                           |  4 ++--
 test/test_manager.rb                       | 20 +++++++++++++-------
 test/test_middleware.rb                    |  9 +++++++++
 test/test_worker_generator.rb              | 17 +++++++++++++++++
 17 files changed, 91 insertions(+), 35 deletions(-)

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