[DRE-commits] [ruby-mixlib-shellout] 07/10: Merge tag 'upstream/2.1.0'

[Antonio Terceiro]

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

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

commit 8a16c8f219ffc602f3ae73809abd945626d69ad6
Merge: 201341d ea5c127
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 13:21:47 2015 -0300

    Merge tag 'upstream/2.1.0'
    
    Upstream version 2.1.0

 README.md                      |  2 +-
 lib/mixlib/shellout.rb         | 53 +++++++++++++++---------
 lib/mixlib/shellout/unix.rb    | 91 ++++++++++++++++++++++++++++++++++--------
 lib/mixlib/shellout/version.rb |  2 +-
 lib/mixlib/shellout/windows.rb |  9 ++++-
 metadata.yml                   | 12 +++---
 6 files changed, 124 insertions(+), 45 deletions(-)

diff --cc lib/mixlib/shellout/unix.rb
index cd9790a,dd22cbe..449546c
--- a/lib/mixlib/shellout/unix.rb
+++ b/lib/mixlib/shellout/unix.rb
@@@ -63,8 -104,8 +104,9 @@@ module Mixli
          # CHEF-3390: Marshall.load on Ruby < 1.8.7p369 also has a GC bug related
          # to Marshall.load, so try disabling GC first.
          propagate_pre_exec_failure
 +        get_child_pgid
  
+         @status = nil
          @result = nil
          @execution_time = 0
  

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