[DRE-commits] [ruby-typhoeus] 01/03: Merge tag 'upstream/1.1.0'

[Sruthi Chandran]

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

srud-guest pushed a commit to branch master
in repository ruby-typhoeus.

commit aa2ec24231733e66d7a000e7d496e193bf73596a
Merge: 13c145b ce9bc5c
Author: Sruthi Chandran <srud at disroot.org>
Date:   Fri Sep 9 18:29:28 2016 +0530

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0

 .travis.yml                            |  1 +
 CHANGELOG.md                           | 10 +++++++++-
 Gemfile                                |  5 +++--
 README.md                              | 13 -------------
 lib/typhoeus/adapters/faraday.rb       |  1 +
 lib/typhoeus/config.rb                 |  7 +++++++
 lib/typhoeus/request.rb                |  2 ++
 lib/typhoeus/response/header.rb        |  1 +
 lib/typhoeus/version.rb                |  2 +-
 spec/typhoeus/adapters/faraday_spec.rb | 31 +++++++++++++++++++++++++++++++
 spec/typhoeus/config_spec.rb           |  2 +-
 spec/typhoeus/request_spec.rb          | 24 +++++++++++++++++++++---
 spec/typhoeus/response/header_spec.rb  | 13 +++++++++++++
 13 files changed, 91 insertions(+), 21 deletions(-)

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