[DRE-commits] [bundler] 08/09: Merge tag 'upstream/1.10.6'

[zeha at debian.org]

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

zeha pushed a commit to annotated tag debian/1.10.6-1
in repository bundler.

commit 8b31c304821ffd44b58b670cbd206d71c4d219ed
Merge: 68f7aad 03453fc
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Aug 18 16:43:45 2015 +0000

    Merge tag 'upstream/1.10.6'
    
    Upstream version 1.10.6

 .travis.yml                                 |   1 -
 CHANGELOG.md                                |  12 ++
 lib/bundler.rb                              |   3 +-
 lib/bundler/cli.rb                          |   4 +-
 lib/bundler/dsl.rb                          |   2 +-
 lib/bundler/installer/parallel_installer.rb |   7 +-
 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/gemfile.5                   |   2 +-
 lib/bundler/man/gemfile.5.txt               |   2 +-
 lib/bundler/remote_specification.rb         |   4 +-
 lib/bundler/source/git/git_proxy.rb         |   2 +-
 lib/bundler/templates/newgem/README.md.tt   |   2 +-
 lib/bundler/version.rb                      |   2 +-
 metadata.yml                                |   7 +-
 25 files changed, 172 insertions(+), 203 deletions(-)

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