From d847c932f5c015f9a3e86a25a79b60dba7e44b9f Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Wed, 9 Jan 2013 23:06:01 +0100
Subject: [PATCH] Version update. Small --tty test.

---
 doc/release_new_version                       | 17 +++++++++++++----
 src/parallel                                  |  2 +-
 testsuite/tests-to-run/parallel-local-ssh1.sh |  6 ++++++
 testsuite/tests-to-run/test61.sh              |  4 ++++
 testsuite/wanted-results/test61               |  6 ++++++
 5 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 testsuite/tests-to-run/parallel-local-ssh1.sh

diff --git a/doc/release_new_version b/doc/release_new_version
index 9164d1b3..d99e5500 100644
--- a/doc/release_new_version
+++ b/doc/release_new_version
@@ -171,15 +171,24 @@ cc:Sandro Cazzaniga <kharec@mandriva.org>,
    Ryoichiro Suzuki <ryoichiro.suzuki@gmail.com>,
    Jesse Alama <jesse.alama@gmail.com>
 
-Subject: GNU Parallel 20121222 ('End of The World') released
+Subject: GNU Parallel 20130122 ('') released
 
-GNU Parallel 20121222 ('End of The World') has been released. It is
+GNU Parallel 20130122 ('') has been released. It is
 available for download at: http://ftp.gnu.org/gnu/parallel/
 
 New in this release:
 
-* Mahout: Parallelising the creation of DecisionTrees
-  http://www.markhneedham.com/blog/2012/12/27/mahout-parallelising-the-creation-of-decisiontrees/
+* Official OpenBSD port:
+  http://ftp.openbsd.org/ports/sysutils/parallel/
+
+* Official DragonFlyBSD package:
+  http://www.mirrorservice.org/sites/ftp.dragonflybsd.org/packages/amd64/DragonFly-3.0.0/stable/parallel/
+
+* Post about niceload in Hungarian:
+  http://commandline.blog.hu/2013/01/02/niceload
+
+* GNU parallel+ssh で複数のリモートホストに複数のコマンドを実行させる
+  http://oshiire.to/archives/1686
 
 * Bug fixes and man page updates.
 
diff --git a/src/parallel b/src/parallel
index 02438a3e..406904ee 100755
--- a/src/parallel
+++ b/src/parallel
@@ -617,7 +617,7 @@ sub get_options_from_array {
 sub parse_options {
     # Returns: N/A
     # Defaults:
-    $Global::version = 20121222;
+    $Global::version = 20130109;
     $Global::progname = 'parallel';
     $Global::infinity = 2**31;
     $Global::debug = 0;
diff --git a/testsuite/tests-to-run/parallel-local-ssh1.sh b/testsuite/tests-to-run/parallel-local-ssh1.sh
new file mode 100644
index 00000000..17f22526
--- /dev/null
+++ b/testsuite/tests-to-run/parallel-local-ssh1.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cat <<'EOF' | sed -e s/\$SERVER1/$SERVER1/\;s/\$SERVER2/$SERVER2/ | parallel -j10 -k -L1
+echo '### Test bug #34241: --pipe should not spawn unneeded processes'
+  seq 5 | ssh csh@lo parallel --block 5 --pipe -j10 cat\\\;echo Block_end
+EOF
diff --git a/testsuite/tests-to-run/test61.sh b/testsuite/tests-to-run/test61.sh
index dd703c25..3d1b1b7e 100644
--- a/testsuite/tests-to-run/test61.sh
+++ b/testsuite/tests-to-run/test61.sh
@@ -28,4 +28,8 @@ parallel -j0 -kX  echo {}-{.} ::: a b c ::: d e f
 echo '### Test of -r with --pipe - the first should give an empty line. The second should not.'
 echo | parallel  -j2 -N1 --pipe cat | wc -l
 echo | parallel -r -j2 -N1 --pipe cat | wc -l
+
+echo '### Test --tty'
+seq 0.1 0.1 0.5 | parallel -j1 --tty tty\;sleep 
+
 EOF
diff --git a/testsuite/wanted-results/test61 b/testsuite/wanted-results/test61
index 91901577..0dc8c46d 100644
--- a/testsuite/wanted-results/test61
+++ b/testsuite/wanted-results/test61
@@ -44,3 +44,9 @@ c-c f-f
 ### Test of -r with --pipe - the first should give an empty line. The second should not.
 1
 0
+### Test --tty
+/dev/tty
+/dev/tty
+/dev/tty
+/dev/tty
+/dev/tty