[DRE-commits] [bundler] 01/02: Merge tag 'upstream/1.5.0_rc.2'

[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 2dbdf54cdb649b6ebbd0830e805c9bcfa3410c37
Merge: 4804dbf ede278b
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Sat Dec 21 22:38:18 2013 +0100

    Merge tag 'upstream/1.5.0_rc.2'
    
    Upstream version 1.5.0~rc.2
    
    # gpg: Signature made Sam 21 Dez 2013 22:38:15 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>"

 .travis.yml                                        |   1 +
 CHANGELOG.md                                       |  12 ++
 Rakefile                                           |   2 +-
 bundler.gemspec                                    |   2 +-
 checksums.yaml.gz                                  | Bin 0 -> 266 bytes
 lib/bundler/gem_installer.rb                       |   9 --
 lib/bundler/installer.rb                           |  42 +++++-
 lib/bundler/man/bundle                             |   2 +-
 lib/bundler/man/bundle-config                      |   2 +-
 lib/bundler/man/bundle-config.txt                  |  36 ++---
 lib/bundler/man/bundle-exec                        |   2 +-
 lib/bundler/man/bundle-exec.txt                    |   2 +-
 lib/bundler/man/bundle-install                     |   2 +-
 lib/bundler/man/bundle-install.txt                 |  34 ++---
 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                  |  82 +++++------
 lib/bundler/man/bundle.txt                         |   2 +-
 lib/bundler/man/gemfile.5                          |   2 +-
 lib/bundler/man/gemfile.5.txt                      |   2 +-
 lib/bundler/rubygems_integration.rb                |  24 +++-
 lib/bundler/ssl_certs/AddTrustExternalCARoot.pem   |  90 ------------
 .../Class3PublicPrimaryCertificationAuthority.pem  |  14 ++
 .../ssl_certs/DigiCertHighAssuranceEVRootCA.pem    |  23 ++++
 ...t_net-Secure-Server-Certification-Authority.pem |  90 ------------
 ...ntrustnetSecureServerCertificationAuthority.pem |  28 ++++
 ...GeoTrust_Global_CA.pem => GeoTrustGlobalCA.pem} |  40 +++---
 ...lass3PublicPrimaryCertificationAuthority-G2.pem |  57 --------
 .../templates/newgem/spec/newgem_spec.rb.tt        |   4 +-
 lib/bundler/version.rb                             |   2 +-
 metadata.yml                                       | 151 +++++++++------------
 spec/commands/newgem_spec.rb                       |   4 +-
 spec/install/gemfile/git_spec.rb                   |   4 +-
 spec/install/gems/simple_case_spec.rb              |   2 +-
 spec/other/ext_spec.rb                             |   2 +-
 spec/spec_helper.rb                                |   4 +-
 spec/support/builders.rb                           |   6 +-
 40 files changed, 321 insertions(+), 470 deletions(-)

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