[DRE-commits] [berkshelf-api] 02/06: Merge tag 'upstream/2.2.0'

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository berkshelf-api.

commit 3b6ab1adb96c5f9f3e273b74853805ab8b4e8da6
Merge: f3ddf23 c136b4a
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Fri Aug 5 16:21:27 2016 +0300

    Merge tag 'upstream/2.2.0'
    
    Upstream version 2.2.0

 README.md                                          |  6 ++++++
 berkshelf-api.gemspec                              | 24 ++++++++++++++--------
 lib/berkshelf/api.rb                               |  2 ++
 lib/berkshelf/api/version.rb                       |  2 +-
 spec/spec_helper.rb                                |  1 -
 .../api/cache_builder/worker/github_spec.rb        |  2 +-
 spec/unit/berkshelf/api/cache_builder_spec.rb      |  4 ++--
 spec/unit/berkshelf/api/cache_manager_spec.rb      | 10 +++++----
 spec/unit/berkshelf/api/endpoint/v1_spec.rb        |  4 ++--
 9 files changed, 35 insertions(+), 20 deletions(-)

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