From 6bd9f69cd98aaa5e37253f6c5fb8fe31978b6a0b Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sat, 23 Jun 2012 20:38:06 +1000
Subject: [PATCH 1/3] 0install: added version 20120622

---
 packager/0install/parallel.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packager/0install/parallel.xml b/packager/0install/parallel.xml
index 7505a362..123116a9 100644
--- a/packager/0install/parallel.xml
+++ b/packager/0install/parallel.xml
@@ -117,11 +117,15 @@ xargs or cat | sh.</description>
 		<implementation id="sha1new=539f41ac825302b6fa66893e6d9c4f51ed048200" released="2012-05-23" version="20120522">
     <manifest-digest sha256="346becd7f4a3214720b894b4d637872f33a349e362d43a048d8d4ba1d9693420"/>
     <archive extract="parallel-20120522" href="http://ftp.gnu.org/gnu/parallel/parallel-20120522.tar.bz2" size="226625"/>
+  </implementation>
+		<implementation id="sha1new=006f918cda3a7cbe620f6e2b66123379c1948089" released="2012-06-23" version="20120622">
+    <manifest-digest sha256="b1182ecf93c1b93e0cf3f22784c27c01f7aa64801f038b652624c3e210e03dea"/>
+    <archive extract="parallel-20120622" href="http://ftp.gnu.org/gnu/parallel/parallel-20120622.tar.bz2" size="228881"/>
   </implementation>
 	</group>
 </interface>
 <!-- Base64 Signature
-iEYEABECAAYFAk+8zokACgkQ/lhgK1iJTtIRswCgoZl/b2sTzF8fK0fiwGBo8h1o7s4An1gyIopr
-1H3rSv+xtItwMkgbR2HN
+iEYEABECAAYFAk/lnIgACgkQ/lhgK1iJTtKfrgCeIjYITindJa50NjPqxCes8e7kF1MAn0qMTpwx
+cvnKdRDwC1px3+HQg435
 
 -->

From a0ee9af15fdbae1982860a6ab2fc0fcc564a0bae Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Thu, 28 Jun 2012 22:19:47 +0700
Subject: [PATCH 2/3] parallel.pod: man page update

---
 src/parallel.pod | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/parallel.pod b/src/parallel.pod
index 154cb13d..c192e7a6 100644
--- a/src/parallel.pod
+++ b/src/parallel.pod
@@ -3272,6 +3272,11 @@ combination of B<seq>, B<cat>, B<echo>, and B<sleep> can reproduce
 most errors. If your example requires large files, see if you can make
 them by something like B<seq 1000000> > B<file>.
 
+=item *
+
+The output of your example. If your problem is not easily reproduced
+by others, the output might help them figure out the problem.
+
 =back
 
 If you suspect the error is dependent on your distribution, please see
@@ -3281,6 +3286,11 @@ http://sourceforge.net/projects/virtualboximage/files/
 Specifying the name of your distribution is not enough as you may have
 installed software that is not in the VirtualBox images.
 
+If you cannot reproduce the error on any of the VirtualBox images
+above, you should assume the debugging will be done through you. That
+will put more burden on you and it is extra important you give any
+information that help.
+
 
 =head1 AUTHOR
 

From 88c50259d8d19fd580987e438401fd7d19439746 Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Thu, 28 Jun 2012 22:38:14 +0700
Subject: [PATCH 3/3] parallel: Fixed bug #36707: --controlmaster eats jobs

---
 src/parallel                               | 2 +-
 testsuite/tests-to-run/parallel-local20.sh | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/parallel b/src/parallel
index e173e1db..e27ab762 100755
--- a/src/parallel
+++ b/src/parallel
@@ -2941,7 +2941,7 @@ sub sshcommand_of_sshlogin {
                     $Global::sshmaster{$pid}++;
                 } else {
                     ::debug($master,"\n");
-                    `$master`;
+                    `$master </dev/null`;
                     ::wait_and_exit(0);
                 }
             }
diff --git a/testsuite/tests-to-run/parallel-local20.sh b/testsuite/tests-to-run/parallel-local20.sh
index f2fe6576..335f4cc9 100644
--- a/testsuite/tests-to-run/parallel-local20.sh
+++ b/testsuite/tests-to-run/parallel-local20.sh
@@ -30,5 +30,9 @@ EOF
 chmod 755 '/tmp/she <bang>"'
 seq 1 3 >/tmp/123
 '/tmp/she <bang>"'
+
 echo '### bug #36595: silent loss of input with --pipe and --sshlogin'
 seq 10000 | xargs | parallel --pipe -S 10/localhost cat | wc
+
+echo 'bug #36707: --controlmaster eats jobs'
+seq 2 | parallel --controlmaster --sshlogin localhost echo OK{}