[DRE-commits] [ruby-mixlib-shellout] 01/04: Merge tag 'upstream/2.2.6'

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository ruby-mixlib-shellout.

commit eeab2c6bb792bce5619d17afef79bd7df7f94b73
Merge: fffe144 5976ec1
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Tue Apr 12 15:36:03 2016 +0300

    Merge tag 'upstream/2.2.6'
    
    Upstream version 2.2.6
    
    Conflicts:
    	README.md
    	lib/mixlib/shellout.rb
    	lib/mixlib/shellout/unix.rb
    	lib/mixlib/shellout/version.rb
    	lib/mixlib/shellout/windows.rb
    	metadata.yml

 Gemfile                                 |  12 +
 LICENSE                                 | 402 ++++++++--------
 README.md                               | 108 ++---
 Rakefile                                |  24 +
 lib/mixlib/shellout.rb                  | 710 +++++++++++++--------------
 lib/mixlib/shellout/exceptions.rb       |  14 +-
 lib/mixlib/shellout/unix.rb             | 830 ++++++++++++++++----------------
 lib/mixlib/shellout/version.rb          |  10 +-
 lib/mixlib/shellout/windows.rb          | 682 ++++++++++++++------------
 lib/mixlib/shellout/windows/core_ext.rb | 743 ++++++++++++++--------------
 metadata.yml                            |  66 ---
 mixlib-shellout-windows.gemspec         |   8 +
 mixlib-shellout.gemspec                 |  24 +
 13 files changed, 1840 insertions(+), 1793 deletions(-)

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