[DRE-commits] [bundler] 02/04: Merge tag 'upstream/1.5.2+dfsg'

[Christian Hofstaedtler]

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

zeha pushed a commit to branch master
in repository bundler.

commit 41aad17de9465682dbe6ee89d4538a8034820f37
Merge: 1009350 515ccef
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Jan 16 16:02:25 2014 +0100

    Merge tag 'upstream/1.5.2+dfsg'
    
    Upstream version 1.5.2+dfsg
    
    # gpg: Signature made Don 16 Jän 2014 16:02:19 CET using RSA key ID 93052E03
    # gpg: Good signature from "Christian Hofstaedtler <christian at hofstaedtler.name>"
    # gpg:                 aka "Christian Hofstaedtler <ch at zeha.at>"
    # gpg:                 aka "Christian Hofstaedtler <zeha at debian.org>"

 CHANGELOG.md                                    |  28 +++-
 bin/bundle                                      |   4 +-
 bundler.gemspec                                 |   2 +-
 lib/bundler/cli.rb                              |   6 +-
 lib/bundler/fetcher.rb                          |  25 +--
 lib/bundler/installer.rb                        |  45 ++----
 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                  |   4 +-
 lib/bundler/man/bundle-install.txt              | 203 ++++++++++++------------
 lib/bundler/man/bundle.txt                      |   2 +-
 lib/bundler/man/gemfile.5                       |   4 +-
 lib/bundler/man/gemfile.5.txt                   |   6 +-
 lib/bundler/parallel_workers/unix_worker.rb     |  16 +-
 lib/bundler/parallel_workers/worker.rb          |   1 +
 lib/bundler/rubygems_ext.rb                     |   2 +-
 lib/bundler/rubygems_integration.rb             |  23 ++-
 lib/bundler/templates/newgem/newgem.gemspec.tt  |   2 +-
 lib/bundler/version.rb                          |   2 +-
 man/bundle-install.ronn                         |   2 +-
 man/gemfile.5.ronn                              |   3 +-
 metadata.yml                                    |  17 +-
 spec/commands/binstubs_spec.rb                  |  13 ++
 spec/install/gemfile/git_spec.rb                |   4 +-
 spec/install/gems/dependency_api_spec.rb        |  34 ++++
 spec/install/gems/packed_spec.rb                |   6 +-
 spec/quality_spec.rb                            |   4 +-
 spec/realworld/parallel_install_spec.rb         |  23 ---
 spec/realworld/parallel_spec.rb                 |  69 ++++++++
 spec/realworld/parallel_update_spec.rb          |  31 ----
 spec/runtime/setup_spec.rb                      |   5 +-
 spec/spec_helper.rb                             |   1 +
 spec/support/artifice/endpoint_host_redirect.rb |  15 ++
 spec/support/permissions.rb                     |  11 ++
 37 files changed, 361 insertions(+), 262 deletions(-)

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