[DRE-commits] [ruby-stomp] 01/05: Merge tag 'upstream/1.3.4'

[Jonas Genannt]

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

genannt pushed a commit to branch master
in repository ruby-stomp.

commit 11952259796251625b23267aea7af053d7997435
Merge: 2b9d5af a70d59a
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Sun May 3 10:44:37 2015 +0200

    Merge tag 'upstream/1.3.4'
    
    Upstream version 1.3.4
    
    # gpg: Signature made Sun 03 May 2015 10:44:37 AM CEST 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>"
    # gpg:                 aka "Jonas Genannt <genannt at debian.org>"
    
    * tag 'upstream/1.3.4':
      Imported Upstream version 1.3.4

 CHANGELOG.rdoc             | 14 +++++++
 README.rdoc                |  5 ++-
 examples/ssl_ctxoptions.rb | 96 ++++++++++++++++++++++++++++++++++++++++++++++
 examples/ssl_newparm.rb    | 43 +++++++++++++++++++++
 examples/ssl_uc2.rb        |  3 +-
 lib/client/utils.rb        |  3 +-
 lib/connection/netio.rb    |  9 ++++-
 lib/connection/utils.rb    |  3 +-
 lib/stomp/client.rb        |  5 ++-
 lib/stomp/connection.rb    | 19 ++++++++-
 lib/stomp/sslparams.rb     |  5 +++
 lib/stomp/version.rb       |  2 +-
 metadata.yml               | 12 ++++--
 spec/client_spec.rb        | 12 ------
 spec/connection_spec.rb    | 11 ++++--
 stomp.gemspec              |  8 +++-
 16 files changed, 217 insertions(+), 33 deletions(-)

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