[DRE-commits] [ruby-amq-client] 01/07: Merge tag 'upstream/1.0.4'

[Jonas Genannt]

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

hggh-guest pushed a commit to branch master
in repository ruby-amq-client.

commit 80e26ebd0c6ba179490fe391085710c2f6691b4b
Merge: 132ecb5 4e9885f
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Fri Feb 14 19:10:33 2014 +0100

    Merge tag 'upstream/1.0.4'
    
    Upstream version 1.0.4
    
    # gpg: Signature made Fri 14 Feb 2014 07:10:33 PM CET using RSA key ID 016CFFD0
    # gpg: Good signature from "Jonas Genannt <jonas at brachium-system.net>"
    # gpg:                 aka "Jonas Genannt <jonas.genannt at capi2name.de>"
    
    * tag 'upstream/1.0.4':
      Imported Upstream version 1.0.4

 .gitignore                                         |  13 ++-
 .travis.yml                                        |  12 +-
 Gemfile                                            |   1 +
 amq-client.gemspec                                 |   2 +-
 bin/ci/before_build.sh                             |  24 ++--
 checksums.yaml.gz                                  | Bin 0 -> 268 bytes
 lib/amq/client/async/adapter.rb                    |  55 +++++++--
 lib/amq/client/async/adapters/coolio.rb            |   4 +
 lib/amq/client/async/adapters/event_machine.rb     |  19 ++-
 lib/amq/client/async/auth_mechanism_adapter.rb     |  69 +++++++++++
 .../async/auth_mechanism_adapter/external.rb       |  27 +++++
 .../client/async/auth_mechanism_adapter/plain.rb   |  24 ++++
 lib/amq/client/async/channel.rb                    |  13 +--
 lib/amq/client/async/consumer.rb                   |   4 +
 lib/amq/client/async/extensions/rabbitmq/cancel.rb |  59 ++++++++++
 lib/amq/client/async/queue.rb                      |   2 +-
 lib/amq/client/exceptions.rb                       |   6 +-
 lib/amq/client/extensions/rabbitmq.rb              |   1 +
 lib/amq/client/extensions/rabbitmq/cancel.rb       |  17 +++
 lib/amq/client/settings.rb                         |  43 +++----
 lib/amq/client/version.rb                          |   2 +-
 metadata.yml                                       | 129 +++++++++------------
 spec/integration/coolio/basic_return_spec.rb       |   8 +-
 spec/integration/coolio/exchange_declare_spec.rb   |   1 -
 spec/integration/eventmachine/basic_return_spec.rb |   6 +-
 .../eventmachine/concurrent_basic_publish_spec.rb  |  79 -------------
 .../eventmachine/connection_start_spec.rb          |  63 ++++++++++
 .../consumer_cancellation_notification_spec.rb     |  76 ++++++++++++
 .../eventmachine/exchange_declare_spec.rb          |   1 -
 29 files changed, 519 insertions(+), 241 deletions(-)

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