[DRE-commits] [bundler] 01/04: Merge tag 'upstream/1.10.5'

[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 c50028fd7cb3137358a7a594cdb89fa6669550bc
Merge: 6098b5d 488c930
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Sun Jun 28 02:41:24 2015 +0200

    Merge tag 'upstream/1.10.5'
    
    Upstream version 1.10.5

 .travis.yml                           |   4 +-
 CHANGELOG.md                          |  23 +++
 README.md                             |   8 +-
 Rakefile                              |   2 +-
 lib/bundler/cli.rb                    |   9 +-
 lib/bundler/cli/check.rb              |   2 +-
 lib/bundler/definition.rb             |  32 ++--
 lib/bundler/endpoint_specification.rb |   9 ++
 lib/bundler/environment.rb            |   4 +-
 lib/bundler/inline.rb                 |   4 +-
 lib/bundler/installer.rb              |  15 +-
 lib/bundler/man/bundle                |   2 +-
 lib/bundler/man/bundle-config         |   2 +-
 lib/bundler/man/bundle-config.txt     |   2 +-
 lib/bundler/man/bundle-exec           |   2 +-
 lib/bundler/man/bundle-exec.txt       |   2 +-
 lib/bundler/man/bundle-install        |  30 +++-
 lib/bundler/man/bundle-install.txt    | 275 ++++++++++++++++++----------------
 lib/bundler/man/bundle-package        |   2 +-
 lib/bundler/man/bundle-package.txt    |   2 +-
 lib/bundler/man/bundle-platform       |   2 +-
 lib/bundler/man/bundle-platform.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             |  17 ++-
 lib/bundler/man/gemfile.5.txt         |  35 +++--
 lib/bundler/remote_specification.rb   |  29 +++-
 lib/bundler/resolver.rb               |   8 +-
 lib/bundler/runtime.rb                |   2 +-
 lib/bundler/source/git.rb             |  11 +-
 lib/bundler/source/path.rb            |   3 +-
 lib/bundler/source/rubygems.rb        |  17 ++-
 lib/bundler/ui/rg_proxy.rb            |   6 +-
 lib/bundler/version.rb                |   2 +-
 man/gemfile.5.ronn                    |  10 ++
 metadata.yml                          |   7 +-
 37 files changed, 373 insertions(+), 215 deletions(-)

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