[DRE-commits] [bundler] 02/04: Merge tag 'upstream/1.7.4'

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository bundler.

commit 59d176b092773702b371035293cf1e1cf757d10e
Merge: c4fcf66 840acaf
Author: Christian Hofstaedtler <christian at hofstaedtler.name>
Date:   Tue Oct 21 21:57:58 2014 +0200

    Merge tag 'upstream/1.7.4'
    
    Upstream version 1.7.4

 .travis.yml                                        |   7 +-
 CHANGELOG.md                                       |  20 ++-
 checksums.yaml.gz                                  | Bin 268 -> 0 bytes
 lib/bundler/cli/gem.rb                             |   1 +
 lib/bundler/cli/install.rb                         |   3 +-
 lib/bundler/cli/package.rb                         |   4 +-
 lib/bundler/cli/update.rb                          |   2 +-
 lib/bundler/definition.rb                          |  26 ++-
 lib/bundler/fetcher.rb                             |  13 +-
 lib/bundler/index.rb                               |   2 +-
 lib/bundler/man/bundle                             |   2 +-
 lib/bundler/man/bundle-config                      |  43 ++++-
 lib/bundler/man/bundle-config.txt                  |  31 +++-
 lib/bundler/man/bundle-install                     |   2 +-
 lib/bundler/man/bundle-install.txt                 |   2 +-
 lib/bundler/man/bundle-update                      |   2 +-
 lib/bundler/man/bundle-update.txt                  |   2 +-
 lib/bundler/man/bundle.txt                         |   2 +-
 lib/bundler/man/gemfile.5                          |  31 +++-
 lib/bundler/man/gemfile.5.txt                      | 174 ++++++++++++---------
 lib/bundler/rubygems_ext.rb                        |   4 +-
 lib/bundler/source/rubygems.rb                     |   6 +-
 lib/bundler/source_list.rb                         |  27 +++-
 .../templates/newgem/ext/newgem/extconf.rb.tt      |   2 +-
 lib/bundler/version.rb                             |   2 +-
 man/bundle-config.ronn                             |  17 +-
 man/gemfile.5.ronn                                 |  17 ++
 metadata.yml                                       |   4 +-
 spec/bundler/source_list_spec.rb                   |  12 +-
 spec/install/deploy_spec.rb                        |  13 ++
 spec/install/gemfile/path_spec.rb                  |  20 +++
 spec/install/gems/dependency_api_spec.rb           |   2 +
 spec/install/gems/simple_case_spec.rb              |  17 +-
 spec/install/gems/sources_spec.rb                  |  12 ++
 spec/spec_helper.rb                                |   2 +-
 35 files changed, 384 insertions(+), 142 deletions(-)

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