This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2386
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2386 by this push:
new 070c031 [DATALAB-2386]: fixed missed merge conflict line
070c031 is described below
commit 070c0310866ea0024ab8a048352543881c334736
Author: leonidfrolov <[email protected]>
AuthorDate: Thu May 6 13:31:45 2021 +0300
[DATALAB-2386]: fixed missed merge conflict line
---
infrastructure-provisioning/src/general/lib/os/fab.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py
b/infrastructure-provisioning/src/general/lib/os/fab.py
index a633872..0d99831 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -745,7 +745,6 @@ def configure_data_engine_service_pip(hostname, os_user,
keyfile, emr=False):
elif not exists('/usr/bin/pip3') and sudo("python3.7 -V 2>/dev/null | awk
'{print $2}'"):
sudo('ln -s /usr/bin/pip-3.7 /usr/bin/pip3')
if emr:
-<<<<<<< HEAD
sudo('pip3 install -U pip=={}'.format(os.environ['conf_pip_version']))
sudo('pip2 install -U pip=={}'.format(os.environ['conf_pip_version']))
sudo('ln -s /usr/local/bin/pip3.7 /bin/pip3.7')
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
