You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/03/26 13:56:12 UTC
[incubator-dlab] branch DLAB-1655 updated (7609e52 -> 1b29d3d)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1655
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
discard 7609e52 [DLAB-1655]: added gcs-connector version to dlab.ini
discard 21d60ee [DLAB-1655]: changed gcs-connector version
discard 5d110f8 Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
discard fdc5776 Merge branch 'develop' of https://github.com/apache/incubator-dlab into develop
discard 83a66f5 [DLAB-1665]: added project specific image removal during image termination for azure
new 1b29d3d [DLAB-1655]: changed gcs-connector version and added to dlab.ini
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7609e52)
\
N -- N -- N refs/heads/DLAB-1655 (1b29d3d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/general/scripts/azure/project_terminate.py | 10 ----------
1 file changed, 10 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1655]: changed gcs-connector version
and added to dlab.ini
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1655
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1b29d3dd7595c81b68a09130010da94b767b252d
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Mar 26 15:55:48 2020 +0200
[DLAB-1655]: changed gcs-connector version and added to dlab.ini
---
infrastructure-provisioning/src/general/conf/dlab.ini | 2 ++
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini
index 8f3528e..f732871 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -286,6 +286,8 @@ matplotlib_version = 2.0.2
jupyterlab_image = odahu\/base-notebook:1.1.0-rc8
### Superset version
superset_version = 0.35.1
+### GCS-connector version
+gcs_connector_version = 2.0.1
#--- [emr] section contains all parameters that are using for emr provisioning ---#
[emr]
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index 5b318c8..9ea0d80 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -1300,8 +1300,8 @@ def ensure_local_jars(os_user, jars_dir):
try:
templates_dir = '/root/templates/'
sudo('mkdir -p {}'.format(jars_dir))
- sudo('wget https://storage.googleapis.com/hadoop-lib/gcs/{0} -O {1}{0}'
- .format('gcs-connector-latest-hadoop2.jar', jars_dir))
+ sudo('wget https://storage.googleapis.com/hadoop-lib/gcs/gcs-connector-hadoop2-{0}.jar -O {1}'
+ 'gcs-connector-hadoop2-{0}.jar'.format(os.environ['notebook_gcs_connector_version'], jars_dir))
sudo('wget https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-yarn-server-web-proxy/2.7.4/{0} -O {1}{0}'
.format('hadoop-yarn-server-web-proxy-2.7.4.jar', jars_dir))
put(templates_dir + 'core-site.xml', '/tmp/core-site.xml')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org