[DRE-commits] [bundler] 01/02: Merge tag 'upstream/1.6.3'

[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 2abad2886e4091483772f29f5652717735ac9dc7
Merge: 701d32a 3ad6564
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Fri Jun 20 19:06:51 2014 +0200

    Merge tag 'upstream/1.6.3'
    
    Upstream version 1.6.3

 CHANGELOG.md                       |   9 +++++++++
 checksums.yaml.gz                  | Bin 268 -> 269 bytes
 lib/bundler/cli/install.rb         |   2 +-
 lib/bundler/cli/open.rb            |  12 +++++-------
 lib/bundler/definition.rb          |   9 ++++-----
 lib/bundler/man/bundle-config      |   2 +-
 lib/bundler/man/bundle-config.txt  |   2 +-
 lib/bundler/man/bundle-install     |   2 +-
 lib/bundler/man/bundle-install.txt |   2 +-
 lib/bundler/man/gemfile.5          |   2 +-
 lib/bundler/man/gemfile.5.txt      |   2 +-
 lib/bundler/resolver.rb            |  23 ++++++++++++++---------
 lib/bundler/source/rubygems.rb     |  20 ++++++++++++++++----
 lib/bundler/version.rb             |   2 +-
 metadata.yml                       |   4 ++--
 spec/cache/gems_spec.rb            |  14 ++++++++++++++
 spec/spec_helper.rb                |   9 +++++----
 17 files changed, 77 insertions(+), 39 deletions(-)

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