Repository: spark Updated Branches: refs/heads/branch-1.0 e6c90583b -> ac6c10e5d
HOTFIX: bug caused by #941 This patch should have qualified the use of PIPE. This needs to be back ported into 0.9 and 1.0. Author: Patrick Wendell <[email protected]> Closes #1108 from pwendell/hotfix and squashes the following commits: 711c58d [Patrick Wendell] HOTFIX: bug caused by #941 (cherry picked from commit b2ebf429e24566c29850c570f8d76943151ad78c) Signed-off-by: Xiangrui Meng <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ac6c10e5 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ac6c10e5 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ac6c10e5 Branch: refs/heads/branch-1.0 Commit: ac6c10e5d160228bb196e0d389f8583e73c42392 Parents: e6c9058 Author: Patrick Wendell <[email protected]> Authored: Tue Jun 17 15:09:24 2014 -0700 Committer: Xiangrui Meng <[email protected]> Committed: Tue Jun 17 15:09:38 2014 -0700 ---------------------------------------------------------------------- ec2/spark_ec2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/ac6c10e5/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 8924464..2ebe97f 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -646,7 +646,7 @@ def ssh(host, opts, command): def _check_output(*popenargs, **kwargs): if 'stdout' in kwargs: raise ValueError('stdout argument not allowed, it will be overridden.') - process = subprocess.Popen(stdout=PIPE, *popenargs, **kwargs) + process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs) output, unused_err = process.communicate() retcode = process.poll() if retcode:
