You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/03/30 10:06:01 UTC
[incubator-datalab] 01/01: Merge remote-tracking branch
'origin/DATALAB-2232-merged' into DATALAB-2091
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 2ee0d9450246612c8f44c5031c1c4e40760b955a
Merge: 5977bcb c042006
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Mar 30 13:05:24 2021 +0300
Merge remote-tracking branch 'origin/DATALAB-2232-merged' into DATALAB-2091
.../src/general/files/aws/jupyter_description.json | 4 +
.../general/files/azure/jupyter_description.json | 4 +
.../dto/aws/exploratory/ExploratoryCreateAws.java | 12 +-
.../azure/exploratory/ExploratoryCreateAzure.java | 27 +----
.../dto/exploratory/ExploratoryBaseDTO.java | 23 ++--
.../dto/exploratory/ExploratoryCreateDTO.java | 60 ++++++----
.../dto/gcp/exploratory/ExploratoryCreateGcp.java | 14 +--
.../datalab/properties/ChangePropertiesConst.java | 6 +-
.../properties/DynamicChangeProperties.java | 9 +-
.../CheckInfrastructureStatusScheduler.java | 4 +-
.../datalab/backendapi/util/RequestBuilder.java | 131 +++++++++------------
.../manage-ungit/manage-ungit.component.html | 2 +-
12 files changed, 135 insertions(+), 161 deletions(-)
diff --cc infrastructure-provisioning/src/general/files/aws/jupyter_description.json
index accfd94,6f9496d..ceb8614
--- a/infrastructure-provisioning/src/general/files/aws/jupyter_description.json
+++ b/infrastructure-provisioning/src/general/files/aws/jupyter_description.json
@@@ -19,11 -19,15 +19,15 @@@
"exploratory_environment_versions" :
[
{
- "template_name": "Jupyter notebook 6.0.2",
+ "template_name": "Jupyter notebook 6.1.6",
"description": "Base image with Jupyter node creation routines",
"environment_type": "exploratory",
- "version": "jupyter_notebook-6.0.2",
+ "version": "jupyter_notebook-6.1.6",
"vendor": "AWS"
}
+ ],
+ "gpu_types": [
+ {"Size": "S", "Gpu_type": "nvidia-tesla-t4"},
+ {"Size": "M", "Gpu_type": "nvidia-tesla-v100"}
]
}
diff --cc infrastructure-provisioning/src/general/files/azure/jupyter_description.json
index 33ed451,d3897f0..2b02a1b
--- a/infrastructure-provisioning/src/general/files/azure/jupyter_description.json
+++ b/infrastructure-provisioning/src/general/files/azure/jupyter_description.json
@@@ -15,11 -15,15 +15,15 @@@
"exploratory_environment_versions" :
[
{
- "template_name": "Jupyter notebook 6.0.2",
+ "template_name": "Jupyter notebook 6.1.6",
"description": "Base image with Jupyter node creation routines",
"environment_type": "exploratory",
- "version": "jupyter_notebook-6.0.2",
+ "version": "jupyter_notebook-6.1.6",
"vendor": "Azure"
}
+ ],
+ "gpu_types": [
+ {"Size": "S", "Gpu_type": "nvidia-tesla-t4"},
+ {"Size": "M", "Gpu_type": "nvidia-tesla-v100"}
]
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org