You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2020/10/21 08:45:16 UTC
[incubator-datalab] branch DATALAB-2114 created (now 7e764a4)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DATALAB-2114
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at 7e764a4 [DATALAB-1952]: Fixed value of master instance number for Dataproc
This branch includes the following new commits:
new afb0fe0 Merge remote-tracking branch 'origin/develop' into develop
new 7e764a4 [DATALAB-1952]: Fixed value of master instance number for Dataproc
The 2 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/02: [DATALAB-1952]: Fixed value of master
instance number for Dataproc
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2114
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 7e764a4220993dda108d81ac975ccfb06341e8af
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Wed Oct 21 11:44:43 2020 +0300
[DATALAB-1952]: Fixed value of master instance number for Dataproc
---
.../computational/cluster-details/cluster-details.component.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
index 0b4e072..71b5ae5 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
@@ -73,7 +73,8 @@
</ng-template>
<div class="col">
<span *ngIf="DICTIONARY[PROVIDER].cloud_provider === 'aws'">{{ resource.totalInstanceCount > 0 ? resource.totalInstanceCount : resource.dataengine_instance_count}}</span>
- <span *ngIf="DICTIONARY[PROVIDER].cloud_provider === 'gcp' || DICTIONARY[PROVIDER].cloud_provider === 'azure'">{{resource.dataengine_instance_count}}</span>
+ <span *ngIf="DICTIONARY[PROVIDER].cloud_provider === 'gcp' && resource.image === 'docker.datalab-dataengine' || DICTIONARY[PROVIDER].cloud_provider === 'azure'">{{resource.dataengine_instance_count}}</span>
+ <span *ngIf="DICTIONARY[PROVIDER].cloud_provider === 'gcp' && resource.image === 'docker.datalab-dataengine-service'">1</span>
</div>
</div>
<div class="row-wrap"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/02: Merge remote-tracking branch
'origin/develop' into develop
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2114
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit afb0fe03b2f55f4a5e2c3228fb2f7cb51f613501
Merge: 1f4a399 6c0033d
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Oct 20 17:50:41 2020 +0300
Merge remote-tracking branch 'origin/develop' into develop
.../src/project/scripts/configure_keycloak.py | 1 +
.../resources/webapp/src/app/shared/navbar/navbar.component.html | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org