[incubator-dlab] branch develop updated (302c380 -> 28bc5e3)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 302c380 Merge pull request #106 from apache/DLAB-569 add 7d9c594 [DLAB-598]: added cluster version on Data Engine Service popup new 28bc5e3 Merge pull request #108 from apache/DLAB-598 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: .../computational/cluster-details/cluster-details.component.html | 4 .../src/main/resources/webapp/src/dictionary/aws.dictionary.ts| 1 + .../src/main/resources/webapp/src/dictionary/azure.dictionary.ts | 1 + .../src/main/resources/webapp/src/dictionary/gcp.dictionary.ts| 1 + 4 files changed, 7 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #108 from apache/DLAB-598
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 28bc5e3471102c8ddbc4e869f100b6008a6081c4 Merge: 302c380 7d9c594 Author: bhliva AuthorDate: Wed Apr 17 16:52:53 2019 +0300 Merge pull request #108 from apache/DLAB-598 [DLAB-598]: added cluster version on Data Engine Service popup .../computational/cluster-details/cluster-details.component.html | 4 .../src/main/resources/webapp/src/dictionary/aws.dictionary.ts| 1 + .../src/main/resources/webapp/src/dictionary/azure.dictionary.ts | 1 + .../src/main/resources/webapp/src/dictionary/gcp.dictionary.ts| 1 + 4 files changed, 7 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-598 deleted (was 7d9c594)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch DLAB-598 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was 7d9c594 [DLAB-598]: added cluster version on Data Engine Service popup The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-598 created (now 7d9c594)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-598 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 7d9c594 [DLAB-598]: added cluster version on Data Engine Service popup This branch includes the following new commits: new 7d9c594 [DLAB-598]: added cluster version on Data Engine Service popup 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. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-598]: added cluster version on Data Engine Service popup
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-598 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 7d9c59498f57b7488e41656a279a71b80c87 Author: Andriana Kovalyshyn AuthorDate: Wed Apr 17 16:49:54 2019 +0300 [DLAB-598]: added cluster version on Data Engine Service popup --- .../computational/cluster-details/cluster-details.component.html | 4 .../src/main/resources/webapp/src/dictionary/aws.dictionary.ts| 1 + .../src/main/resources/webapp/src/dictionary/azure.dictionary.ts | 1 + .../src/main/resources/webapp/src/dictionary/gcp.dictionary.ts| 1 + 4 files changed, 7 insertions(+) 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 fc79c1c..ec62674 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 @@ -40,6 +40,10 @@ Cluster type: {{ resource.template_name }} + + Cluster version: + {{ resource[DICTIONARY.cluster_version] }} + Cluster alias: diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts index bbb35a5..c87b95a 100644 --- a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts +++ b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts @@ -33,6 +33,7 @@ export const NAMING_CONVENTION = { 'slave_node_shape': 'slave_node_shape', 'total_instance_number': 'total_instance_number', 'spot_instance': 'Spot instance', +'cluster_version': 'emr_version', 'billing': { 'resourceName': 'resource_name', 'cost': 'cost', diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts index 52a264d..66f73f8 100644 --- a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts +++ b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts @@ -34,6 +34,7 @@ export const NAMING_CONVENTION = { 'total_instance_number': 'dataengine_instance_count', 'spot_instance': 'Low-priority virtual machines', +'cluster_version': '', 'billing': { 'resourceName': 'resourceName', 'cost': 'costString', diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts index 15f2f17..f6ef295 100644 --- a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts +++ b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts @@ -35,6 +35,7 @@ export const NAMING_CONVENTION = { 'total_instance_number': 'total_instance_number', 'spot_instance': 'Preemptible worker nodes', + 'cluster_version': 'dataproc_version', 'billing': { 'resourceName': 'resource_name', 'cost': 'cost', - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #106 from apache/DLAB-569
This is an automated email from the ASF dual-hosted git repository. ioleksandr pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 302c380058aff6fe728ab8508aa88f29b35fefef Merge: e681bd1 9b2266c Author: i.oleksandr AuthorDate: Wed Apr 17 16:42:42 2019 +0300 Merge pull request #106 from apache/DLAB-569 [DLAB-569]: Added NTP client to all DLab nodes .../src/base/scripts/install_prerequisites.py | 4 .../src/general/lib/os/debian/common_lib.py| 16 ++ .../src/general/lib/os/redhat/common_lib.py| 19 +++- .../general/scripts/aws/dataengine_configure.py| 11 ++ .../general/scripts/aws/deeplearning_configure.py | 7 +++--- .../src/general/scripts/aws/edge_prepare.py| 6 ++ .../src/general/scripts/aws/jupyter_configure.py | 9 +--- .../src/general/scripts/aws/rstudio_configure.py | 6 -- .../scripts/aws/tensor-rstudio_configure.py| 9 +--- .../src/general/scripts/aws/tensor_configure.py| 9 +--- .../src/general/scripts/aws/zeppelin_configure.py | 6 -- .../general/scripts/azure/dataengine_configure.py | 25 +- .../scripts/azure/deeplearning_configure.py| 6 +++--- .../src/general/scripts/azure/edge_prepare.py | 11 ++ .../src/general/scripts/azure/jupyter_configure.py | 5 +++-- .../src/general/scripts/azure/rstudio_configure.py | 5 +++-- .../src/general/scripts/azure/tensor_configure.py | 5 +++-- .../general/scripts/azure/zeppelin_configure.py| 5 +++-- .../general/scripts/gcp/dataengine_configure.py| 20 +++-- .../src/general/scripts/gcp/edge_prepare.py| 2 +- .../src/general/scripts/gcp/jupyter_configure.py | 6 -- .../src/general/scripts/gcp/rstudio_configure.py | 9 +--- .../scripts/gcp/tensor-rstudio_configure.py| 9 +--- .../src/general/scripts/gcp/tensor_configure.py| 12 +++ .../src/general/scripts/gcp/zeppelin_configure.py | 13 +-- 25 files changed, 167 insertions(+), 68 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (e681bd1 -> 302c380)
This is an automated email from the ASF dual-hosted git repository. ioleksandr pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from e681bd1 Merge pull request #107 from apache/DLAB-592 add 393e8a1 [DLAB-569]: Added installation of NTPd add 9d0fc97 [DLAB-569]: Fixed issue with NTP in private subnet add b1d0863 [DLAB-569]: Fixed issue with NTP in private subnet add 3bf62d8 [DLAB-569]: Fixed issue with NTP in private subnet add 8f8ddaa [DLAB-569]: Fixed issue with NTP in private subnet add a40d5e2 [DLAB-569]: Fixed issue with NTP in private subnet add 9b2266c [DLAB-569]: fixed issue with ntpd new 302c380 Merge pull request #106 from apache/DLAB-569 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/base/scripts/install_prerequisites.py | 4 .../src/general/lib/os/debian/common_lib.py| 16 ++ .../src/general/lib/os/redhat/common_lib.py| 19 +++- .../general/scripts/aws/dataengine_configure.py| 11 ++ .../general/scripts/aws/deeplearning_configure.py | 7 +++--- .../src/general/scripts/aws/edge_prepare.py| 6 ++ .../src/general/scripts/aws/jupyter_configure.py | 9 +--- .../src/general/scripts/aws/rstudio_configure.py | 6 -- .../scripts/aws/tensor-rstudio_configure.py| 9 +--- .../src/general/scripts/aws/tensor_configure.py| 9 +--- .../src/general/scripts/aws/zeppelin_configure.py | 6 -- .../general/scripts/azure/dataengine_configure.py | 25 +- .../scripts/azure/deeplearning_configure.py| 6 +++--- .../src/general/scripts/azure/edge_prepare.py | 11 ++ .../src/general/scripts/azure/jupyter_configure.py | 5 +++-- .../src/general/scripts/azure/rstudio_configure.py | 5 +++-- .../src/general/scripts/azure/tensor_configure.py | 5 +++-- .../general/scripts/azure/zeppelin_configure.py| 5 +++-- .../general/scripts/gcp/dataengine_configure.py| 20 +++-- .../src/general/scripts/gcp/edge_prepare.py| 2 +- .../src/general/scripts/gcp/jupyter_configure.py | 6 -- .../src/general/scripts/gcp/rstudio_configure.py | 9 +--- .../scripts/gcp/tensor-rstudio_configure.py| 9 +--- .../src/general/scripts/gcp/tensor_configure.py| 12 +++ .../src/general/scripts/gcp/zeppelin_configure.py | 13 +-- 25 files changed, 167 insertions(+), 68 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-569 deleted (was 9b2266c)
This is an automated email from the ASF dual-hosted git repository. ioleksandr pushed a change to branch DLAB-569 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was 9b2266c [DLAB-569]: fixed issue with ntpd The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (ce3633c -> e681bd1)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from ce3633c DLAB-000 fixed bug on gcp connected with security configuration add d0c23d2 [DLAB-592] Upgrade Dataproc to 1.2 and 1.4 [bugfix] - update Zeppelin from 0.8.0 to 0.8.1 for Spark 2.4.0 support - change autotest Dataproc version to 1.2 from 1.1 new e681bd1 Merge pull request #107 from apache/DLAB-592 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: infrastructure-provisioning/src/general/conf/dlab.ini | 2 +- .../src/general/files/aws/zeppelin_description.json | 4 ++-- .../src/general/files/azure/zeppelin_description.json | 4 ++-- .../src/general/files/gcp/zeppelin_description.json | 4 ++-- integration-tests/examples/gcp_templates/deeplearning/dataproc.json | 2 +- integration-tests/examples/gcp_templates/jupyter/dataproc.json| 2 +- integration-tests/examples/gcp_templates/rstudio/dataproc.json| 2 +- integration-tests/examples/gcp_templates/tensor/dataproc.json | 2 +- integration-tests/examples/gcp_templates/zeppelin/dataproc.json | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #107 from apache/DLAB-592
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit e681bd1c12ef4e0579fb9082e941e7da90ec7b2c Merge: ce3633c d0c23d2 Author: Oleh Martushevskyi AuthorDate: Wed Apr 17 16:34:12 2019 +0300 Merge pull request #107 from apache/DLAB-592 [DLAB-592] Upgrade Dataproc to 1.2 and 1.4 [bugfix] infrastructure-provisioning/src/general/conf/dlab.ini | 2 +- .../src/general/files/aws/zeppelin_description.json | 4 ++-- .../src/general/files/azure/zeppelin_description.json | 4 ++-- .../src/general/files/gcp/zeppelin_description.json | 4 ++-- integration-tests/examples/gcp_templates/deeplearning/dataproc.json | 2 +- integration-tests/examples/gcp_templates/jupyter/dataproc.json| 2 +- integration-tests/examples/gcp_templates/rstudio/dataproc.json| 2 +- integration-tests/examples/gcp_templates/tensor/dataproc.json | 2 +- integration-tests/examples/gcp_templates/zeppelin/dataproc.json | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-592 deleted (was d0c23d2)
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a change to branch DLAB-592 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was d0c23d2 [DLAB-592] Upgrade Dataproc to 1.2 and 1.4 [bugfix] - update Zeppelin from 0.8.0 to 0.8.1 for Spark 2.4.0 support - change autotest Dataproc version to 1.2 from 1.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-592] Upgrade Dataproc to 1.2 and 1.4 [bugfix] - update Zeppelin from 0.8.0 to 0.8.1 for Spark 2.4.0 support - change autotest Dataproc version to 1.2 from 1.1
This is an automated email from the ASF dual-hosted git repository. ioleksandr pushed a commit to branch DLAB-592 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit d0c23d260f3654445a478e7871f96f39c7231259 Author: Oleksandr_Isniuk AuthorDate: Wed Apr 17 16:31:22 2019 +0300 [DLAB-592] Upgrade Dataproc to 1.2 and 1.4 [bugfix] - update Zeppelin from 0.8.0 to 0.8.1 for Spark 2.4.0 support - change autotest Dataproc version to 1.2 from 1.1 --- infrastructure-provisioning/src/general/conf/dlab.ini | 2 +- .../src/general/files/aws/zeppelin_description.json | 4 ++-- .../src/general/files/azure/zeppelin_description.json | 4 ++-- .../src/general/files/gcp/zeppelin_description.json | 4 ++-- integration-tests/examples/gcp_templates/deeplearning/dataproc.json | 2 +- integration-tests/examples/gcp_templates/jupyter/dataproc.json| 2 +- integration-tests/examples/gcp_templates/rstudio/dataproc.json| 2 +- integration-tests/examples/gcp_templates/tensor/dataproc.json | 2 +- integration-tests/examples/gcp_templates/zeppelin/dataproc.json | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini index ca80d40..91f5658 100644 --- a/infrastructure-provisioning/src/general/conf/dlab.ini +++ b/infrastructure-provisioning/src/general/conf/dlab.ini @@ -222,7 +222,7 @@ jupyter_version = 5.7.4 ### Version of TensorFlow to be installed on notebook tensorflow_version = 1.8.0 ### Version of Zeppelin to be installed on notebook -zeppelin_version = 0.8.0 +zeppelin_version = 0.8.1 ### Version of Rstudio to be installed on notebook rstudio_version = 1.1.463 ### Version of Scala to be installed on notebook diff --git a/infrastructure-provisioning/src/general/files/aws/zeppelin_description.json b/infrastructure-provisioning/src/general/files/aws/zeppelin_description.json index 31cb86d..dcd39c6 100644 --- a/infrastructure-provisioning/src/general/files/aws/zeppelin_description.json +++ b/infrastructure-provisioning/src/general/files/aws/zeppelin_description.json @@ -19,10 +19,10 @@ "exploratory_environment_versions" : [ { - "template_name": "Apache Zeppelin 0.8.0", + "template_name": "Apache Zeppelin 0.8.1", "description": "Base image with Apache Zeppelin node creation routines", "environment_type": "exploratory", - "version": "zeppelin-0.8.0", + "version": "zeppelin-0.8.1", "vendor": "AWS" } ] diff --git a/infrastructure-provisioning/src/general/files/azure/zeppelin_description.json b/infrastructure-provisioning/src/general/files/azure/zeppelin_description.json index 499d3ff..f5b829f 100644 --- a/infrastructure-provisioning/src/general/files/azure/zeppelin_description.json +++ b/infrastructure-provisioning/src/general/files/azure/zeppelin_description.json @@ -15,10 +15,10 @@ "exploratory_environment_versions" : [ { - "template_name": "Apache Zeppelin 0.8.0", + "template_name": "Apache Zeppelin 0.8.1", "description": "Base image with Apache Zeppelin node creation routines", "environment_type": "exploratory", - "version": "zeppelin-0.8.0", + "version": "zeppelin-0.8.1", "vendor": "Azure" } ] diff --git a/infrastructure-provisioning/src/general/files/gcp/zeppelin_description.json b/infrastructure-provisioning/src/general/files/gcp/zeppelin_description.json index 44b7c61..6539c06 100644 --- a/infrastructure-provisioning/src/general/files/gcp/zeppelin_description.json +++ b/infrastructure-provisioning/src/general/files/gcp/zeppelin_description.json @@ -23,10 +23,10 @@ "exploratory_environment_versions" : [ { - "template_name": "Apache Zeppelin 0.8.0", + "template_name": "Apache Zeppelin 0.8.1", "description": "Base image with Apache Zeppelin node creation routines", "environment_type": "exploratory", - "version": "zeppelin-0.8.0", + "version": "zeppelin-0.8.1", "vendor": "GCP" } ] diff --git a/integration-tests/examples/gcp_templates/deeplearning/dataproc.json b/integration-tests/examples/gcp_templates/deeplearning/dataproc.json index 9130f3d..1f4724f 100644 --- a/integration-tests/examples/gcp_templates/deeplearning/dataproc.json +++ b/integration-tests/examples/gcp_templates/deeplearning/dataproc.json @@ -6,7 +6,7 @@ "dataproc_preemptible_count": "0", "dataproc_master_instance_type" : "n1-standard-2", "dataproc_slave_instance_type" : "n1-standard-2", - "dataproc_version" : "1.1", + "dataproc_version" : "1.2", "notebook_name": "set notebook name", "template_name" : "Dataproc cluster" } \ No newline at end of file diff --git a/integration-tests/examples/gcp_templates/jupyter/dataproc.json b/integration-tests/examples/gcp_templates/jupyter/dataproc.json index 9
[incubator-dlab] branch DLAB-592 created (now d0c23d2)
This is an automated email from the ASF dual-hosted git repository. ioleksandr pushed a change to branch DLAB-592 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at d0c23d2 [DLAB-592] Upgrade Dataproc to 1.2 and 1.4 [bugfix] - update Zeppelin from 0.8.0 to 0.8.1 for Spark 2.4.0 support - change autotest Dataproc version to 1.2 from 1.1 This branch includes the following new commits: new d0c23d2 [DLAB-592] Upgrade Dataproc to 1.2 and 1.4 [bugfix] - update Zeppelin from 0.8.0 to 0.8.1 for Spark 2.4.0 support - change autotest Dataproc version to 1.2 from 1.1 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. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated: DLAB-000 fixed bug on gcp connected with security configuration
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/develop by this push: new ce3633c DLAB-000 fixed bug on gcp connected with security configuration ce3633c is described below commit ce3633cc8fdc9686ca0290f461d4fd28d8fa9608 Author: bhliva AuthorDate: Wed Apr 17 16:16:12 2019 +0300 DLAB-000 fixed bug on gcp connected with security configuration --- .../src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java | 2 +- .../java/com/epam/dlab/auth/gcp/service/GcpAuthenticationService.java | 2 +- .../main/java/com/epam/dlab/auth/SecurityServiceConfiguration.java| 2 +- .../java/com/epam/dlab/auth/modules/GcpSecurityServiceModule.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/common/src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java b/services/common/src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java index 1ca2374..6dbaf02 100644 --- a/services/common/src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java +++ b/services/common/src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java @@ -17,7 +17,7 @@ * under the License. */ -package com.epam.dlab.config.gcp; +package com.epam.dlab.auth.conf; import lombok.Data; diff --git a/services/security-gcp/src/main/java/com/epam/dlab/auth/gcp/service/GcpAuthenticationService.java b/services/security-gcp/src/main/java/com/epam/dlab/auth/gcp/service/GcpAuthenticationService.java index 2f338d5..3f70ce9 100644 --- a/services/security-gcp/src/main/java/com/epam/dlab/auth/gcp/service/GcpAuthenticationService.java +++ b/services/security-gcp/src/main/java/com/epam/dlab/auth/gcp/service/GcpAuthenticationService.java @@ -21,8 +21,8 @@ package com.epam.dlab.auth.gcp.service; import com.epam.dlab.auth.UserInfo; import com.epam.dlab.auth.UserInfoDAO; +import com.epam.dlab.auth.conf.GcpLoginConfiguration; import com.epam.dlab.auth.oauth2.Oauth2AuthenticationService; -import com.epam.dlab.config.gcp.GcpLoginConfiguration; import com.epam.dlab.exceptions.DlabAuthenticationException; import com.epam.dlab.exceptions.DlabException; import com.google.api.client.auth.oauth2.AuthorizationCodeFlow; diff --git a/services/security-service/src/main/java/com/epam/dlab/auth/SecurityServiceConfiguration.java b/services/security-service/src/main/java/com/epam/dlab/auth/SecurityServiceConfiguration.java index 839f19b..ac682ec 100644 --- a/services/security-service/src/main/java/com/epam/dlab/auth/SecurityServiceConfiguration.java +++ b/services/security-service/src/main/java/com/epam/dlab/auth/SecurityServiceConfiguration.java @@ -22,8 +22,8 @@ package com.epam.dlab.auth; import com.epam.dlab.ServiceConfiguration; import com.epam.dlab.auth.conf.AzureLoginConfiguration; +import com.epam.dlab.auth.conf.GcpLoginConfiguration; import com.epam.dlab.auth.dao.Request; -import com.epam.dlab.config.gcp.GcpLoginConfiguration; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.directory.ldap.client.api.LdapConnectionConfig; diff --git a/services/security-service/src/main/java/com/epam/dlab/auth/modules/GcpSecurityServiceModule.java b/services/security-service/src/main/java/com/epam/dlab/auth/modules/GcpSecurityServiceModule.java index 29a16a9..abddab2 100644 --- a/services/security-service/src/main/java/com/epam/dlab/auth/modules/GcpSecurityServiceModule.java +++ b/services/security-service/src/main/java/com/epam/dlab/auth/modules/GcpSecurityServiceModule.java @@ -21,6 +21,7 @@ package com.epam.dlab.auth.modules; import com.epam.dlab.auth.SecurityServiceConfiguration; import com.epam.dlab.auth.UserVerificationService; +import com.epam.dlab.auth.conf.GcpLoginConfiguration; import com.epam.dlab.auth.gcp.resources.GcpOauth2SecurityResource; import com.epam.dlab.auth.gcp.service.GcpAuthenticationService; import com.epam.dlab.auth.oauth2.Oauth2AuthenticationService; @@ -28,7 +29,6 @@ import com.epam.dlab.auth.resources.SynchronousLdapAuthenticationResource; import com.epam.dlab.cloud.CloudModule; import com.google.api.client.auth.oauth2.AuthorizationCodeFlow; import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow; -import com.epam.dlab.config.gcp.GcpLoginConfiguration; import com.google.api.client.http.HttpTransport; import com.google.api.client.http.javanet.NetHttpTransport; import com.google.api.client.json.jackson2.JacksonFactory; @@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit; public class GcpSecurityServiceModule extends CloudModule { private static final List SCOPES = Arrays.asList("https://www.googleapis.com/auth/plus.login";, "email", "profile", "https://www.googleapis.com/auth/plus.me";); - private final com.epam.dlab.config.gcp.GcpLoginConfiguration conf; +
[incubator-dlab] branch DLAB-569 updated: [DLAB-569]: fixed issue with ntpd
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a commit to branch DLAB-569 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/DLAB-569 by this push: new 9b2266c [DLAB-569]: fixed issue with ntpd 9b2266c is described below commit 9b2266cf72845d32e49a22ecb9bc01d043c64e0d Author: Oleh Martushevskyi AuthorDate: Wed Apr 17 15:18:32 2019 +0300 [DLAB-569]: fixed issue with ntpd --- infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py index ffe9072..316f792 100644 --- a/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/redhat/common_lib.py @@ -79,6 +79,7 @@ def find_java_path_local(): def ensure_ntpd(user, edge_private_ip=''): try: if not exists('/home/{}/.ensure_dir/ntpd_ensured'.format(user)): +sudo('systemctl disable chronyd') sudo('yum -y install ntp') sudo('echo "tinker panic 0" >> /etc/ntp.conf') sudo('systemctl start ntpd') - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (826848e -> 9d14250)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 826848e Merge pull request #104 from apache/DLAB-603 add dcd7dfa DLAB-582 added scm maven properties add 6f5c164 [DLAB-582]: added copying of git directory new 9d14250 Merge pull request #105 from apache/bugfix-DLAB-582 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: infrastructure-provisioning/src/general/files/aws/ssn_Dockerfile | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #105 from apache/bugfix-DLAB-582
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 9d14250051d32fd07c7e980ea675d3e730cb7089 Merge: 826848e 6f5c164 Author: bhliva AuthorDate: Wed Apr 17 15:01:05 2019 +0300 Merge pull request #105 from apache/bugfix-DLAB-582 Bugfix dlab 582 infrastructure-provisioning/src/general/files/aws/ssn_Dockerfile | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch bugfix-DLAB-582 deleted (was 6f5c164)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch bugfix-DLAB-582 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was 6f5c164 [DLAB-582]: added copying of git directory The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch bugfix-DLAB-582 updated: [DLAB-582]: added copying of git directory
This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a commit to branch bugfix-DLAB-582 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/bugfix-DLAB-582 by this push: new 6f5c164 [DLAB-582]: added copying of git directory 6f5c164 is described below commit 6f5c16404d388f730911c67696f26a0ee16d8f63 Author: Oleh Martushevskyi AuthorDate: Wed Apr 17 14:25:02 2019 +0300 [DLAB-582]: added copying of git directory --- infrastructure-provisioning/src/general/files/aws/ssn_Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/general/files/aws/ssn_Dockerfile b/infrastructure-provisioning/src/general/files/aws/ssn_Dockerfile index 7bb561e..7283925 100644 --- a/infrastructure-provisioning/src/general/files/aws/ssn_Dockerfile +++ b/infrastructure-provisioning/src/general/files/aws/ssn_Dockerfile @@ -34,4 +34,4 @@ RUN chmod a+x /root/fabfile.py; \ RUN mkdir /project_tree COPY . /project_tree - +COPY .git /project_tree/ - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #104 from apache/DLAB-603
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 826848ece7ef602c07830440f390a14e2fbf9991 Merge: 8450ca0 f2b2fab Author: bhliva AuthorDate: Wed Apr 17 14:14:19 2019 +0300 Merge pull request #104 from apache/DLAB-603 [DLAB-603]: added Edge IP on management grid .../src/app/management/management-grid/management-grid.component.html | 4 ++-- .../main/resources/webapp/src/app/management/management.component.ts | 1 + .../src/main/resources/webapp/src/app/management/management.model.ts | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-603 deleted (was f2b2fab)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch DLAB-603 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. was f2b2fab [DLAB-603]: added Edge IP on management grid The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (8450ca0 -> 826848e)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 8450ca0 Merge pull request #103 from apache/DLAB-606 add f2b2fab [DLAB-603]: added Edge IP on management grid new 826848e Merge pull request #104 from apache/DLAB-603 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/app/management/management-grid/management-grid.component.html | 4 ++-- .../main/resources/webapp/src/app/management/management.component.ts | 1 + .../src/main/resources/webapp/src/app/management/management.model.ts | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-603]: added Edge IP on management grid
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-603 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit f2b2fab158354cf934e0005bfe27167de3ae7010 Author: Andriana Kovalyshyn AuthorDate: Wed Apr 17 13:55:35 2019 +0300 [DLAB-603]: added Edge IP on management grid --- .../src/app/management/management-grid/management-grid.component.html | 4 ++-- .../main/resources/webapp/src/app/management/management.component.ts | 1 + .../src/main/resources/webapp/src/app/management/management.model.ts | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html index 42bae6b..61f37d3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/management/management-grid/management-grid.component.html @@ -22,7 +22,7 @@ User Name Status -Shape +Shape / Resource id Computational resources Action @@ -31,7 +31,7 @@ {{ env.user }} {{ env.name }} {{env.status}} -{{ env.shape }} +{{ env.shape || env.ip }} diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts index 8d21583..ac819a3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/management/management.component.ts @@ -253,6 +253,7 @@ export class ManagementComponent implements OnInit, OnDestroy { value.shape, value.computational_resources, value.user, + value.public_ip, value.resource_type )); } diff --git a/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts b/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts index 79d55c8..51ab721 100644 --- a/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/management/management.model.ts @@ -24,6 +24,7 @@ export class EnvironmentModel { public shape: string, public resources: Array, public user: string, +public ip: string, public type?: string ) { } } - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-603 created (now f2b2fab)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-603 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at f2b2fab [DLAB-603]: added Edge IP on management grid This branch includes the following new commits: new f2b2fab [DLAB-603]: added Edge IP on management grid 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. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch inactivity_integration updated: DLAB-000 fixed merge conflicts
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch inactivity_integration in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/inactivity_integration by this push: new 6426d06 DLAB-000 fixed merge conflicts 6426d06 is described below commit 6426d0606b68496c72df5fefb2da42253ba66112 Author: bhliva AuthorDate: Wed Apr 17 12:46:43 2019 +0300 DLAB-000 fixed merge conflicts --- .../backendapi/service/impl/SchedulerJobServiceImpl.java | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImpl.java index 180884e..c906712 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/SchedulerJobServiceImpl.java @@ -25,6 +25,7 @@ import com.epam.dlab.backendapi.dao.ComputationalDAO; import com.epam.dlab.backendapi.dao.EnvDAO; import com.epam.dlab.backendapi.dao.ExploratoryDAO; import com.epam.dlab.backendapi.dao.SchedulerJobDAO; +import com.epam.dlab.backendapi.domain.RequestId; import com.epam.dlab.backendapi.service.ComputationalService; import com.epam.dlab.backendapi.service.ExploratoryService; import com.epam.dlab.backendapi.service.SchedulerJobService; @@ -33,12 +34,10 @@ import com.epam.dlab.dto.UserInstanceDTO; import com.epam.dlab.dto.UserInstanceStatus; import com.epam.dlab.dto.base.DataEngineType; import com.epam.dlab.dto.computational.UserComputationalResource; -import com.epam.dlab.dto.status.EnvResource; import com.epam.dlab.exceptions.ResourceInappropriateStateException; import com.epam.dlab.exceptions.ResourceNotFoundException; import com.epam.dlab.model.scheduler.SchedulerJobData; import com.epam.dlab.rest.client.RESTService; -import com.epam.dlab.rest.contracts.InfrasctructureAPI; import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.inject.name.Named; @@ -46,8 +45,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import java.time.*; -import java.util.Date; import java.time.temporal.ChronoUnit; +import java.util.Date; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -55,7 +54,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.epam.dlab.backendapi.dao.SchedulerJobDAO.TIMEZONE_PREFIX; import static com.epam.dlab.constants.ServiceConsts.PROVISIONING_SERVICE_NAME; import static com.epam.dlab.dto.UserInstanceStatus.*; import static com.epam.dlab.dto.base.DataEngineType.getDockerImageName; @@ -306,10 +304,8 @@ public class SchedulerJobServiceImpl implements SchedulerJobService { return schedulerJobDAO.getExploratorySchedulerWithStatusAndClusterLastActivityLessThan(RUNNING, clusterMaxInactivityAllowedDate) .stream() - .filter(schedulerJobData -> shouldSchedulerBeExecuted(schedulerJobData.getJobDTO(), - currentDateTime, schedulerJobData.getJobDTO().getStopDaysRepeat(), - schedulerJobData.getJobDTO().getEndTime()) || - (checkInactivity && exploratoryInactivityCondition(schedulerJobData))) + .filter(canSchedulerForStoppingBeApplied(currentDateTime) + .or(schedulerJobData -> checkInactivity && exploratoryInactivityCondition(schedulerJobData))) .collect(Collectors.toList()); } @@ -358,7 +354,8 @@ public class SchedulerJobServiceImpl implements SchedulerJobService { return schedulerJobDAO .getComputationalSchedulerDataWithOneOfStatus(RUNNING, DataEngineType.SPARK_STANDALONE, RUNNING) .stream() - .filter(canSchedulerForStoppingBeApplied(currentDateTime)) + .filter(canSchedulerForStoppingBeApplied(currentDateTime) + .or(schedulerJobData -> checkInactivity && computationalInactivityCondition(schedulerJobData))) .collect(Collectors.toList()); } - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch inactivity_integration updated (4bb0fbc -> f4fdcbe)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch inactivity_integration in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 4bb0fbc [DLAB-454]: added terminate_datetime request parameter new 69f9d28 [DLAB-77] Created Rstudio with Tensorflow image new 3d9a205 [DLAB-77] Corrected Tensorflow version new 6677420 Merge pull request #72 from Dyoma33/DLAB-77-dev new 005f11e DLAB-527 fixed bug connected with billing on azure new 086fc51 Merge pull request #73 from apache/bugfix-DLAB-527 new ddc2044 [DLAB-77] Fixed result.write operation new ceb071c Merge pull request #74 from Dyoma33/DLAB-77-dev new 2f79cd9 DLAB-574 removed azure_client_id param from docker requests new c042f0d Merge pull request #75 from apache/bugfix-DLAB-574 new 7bea848 [DLAB-77] Added username and pass to json new be9cc6a Merge pull request #76 from Dyoma33/DLAB-77-dev new ce25664 DLAB-000 unit test fixed new 0b74de8 [DLAB-551]: Fix problem with create notebooks of the same template simultaneously new cd23b5d [DLAB-551]: Fix problem with create notebooks of the same template simultaneously add all templates new effe960 Merge pull request #77 from ioleksandr/DLAB-551 new 0410ffc [DLAB-589] Remove n1-standard-1 shape new 7932305 Merge pull request #78 from Dyoma33/DLAB-580 new c1c4451 [DLAB-77-551] Fixed image creation issue for Tensor-Rstudio new 04ccc64 Merge pull request #79 from Dyoma33/DLAB-77-dev new b898523 [DLAB-77] Added missing coma new e3bc758 Merge pull request #80 from Dyoma33/DLAB-77-dev new 12771be [DLAB-551]: add forgotten lib new 31518ab Merge pull request #81 from ioleksandr/DLAB-551 new 06f1da6 DLAB-582 added API for getting DLab version new d2deca8 Merge pull request #82 from apache/feature-DLAB-582 new 2ee1914 [DLAB-77] Fixed dataengine creation issue due to missing GPU in spark cluster nodes new 2d42d33 Merge pull request #83 from Dyoma33/DLAB-77-dev new 709033c create ssn subnet in chosen zone new 970b474 create ssn subnet in chosen zone new efb4852 create ssn subnet in chosen zone new ad5c564 fix_typo new b362662 typo fix new a25502c add possibility to choose zone on edge provisioning new 7f9695e [DLAB-599] Add possibility to choose zone during DLab deployment new 837e8f1 [DLAB-599] Add possibility to choose zone during DLab deployment new d27782d [GCP]: Fix Data Engine creation fails on DeepLearning -remove old and unsupported library Caffe -change versionc of cuda for Data Engine on deeplearning new 7c6f1c9 Merge pull request #84 from apache/DLAB-523 new d58afd8 [DLAB-580] Changed shape in integration tests new 6cfbeb5 Merge pull request #85 from Dyoma33/DLAB-580 new 0858bba [DLAB-456]: fixed issue with header structure new 3e3c33a Merge pull request #86 from apache/DLAB-456 new 583cf02 [DLAB-593]: Fixed issue with removing IAM resources new e66a70a Merge pull request #87 from apache/DLAB-593 new 4c04431 [DLAB-594]: added tags for Elastic IPs new 2cad14f [DLAB-594]: added tags for VPCs,subnets, Route tables, SGs and IAM roles new e506e4b [DLAB-594]: fixed issue with creating IAM role and added tag for peering connection new 4348401 [DLAB-594]: fixed issue with creating IAM role new 6c7a30a [DLAB-594]: fixed issue with removing peering connection during rolling back new e2b5f80 debugging new 74788b1 [DLAB-594]: Fixed issue second VPC new b8bec80 [DLAB-594]: Fixed typo new 4900f52 [DLAB-594]: Fixed typo new f74984a Merge pull request #88 from apache/DLAB-594 new ae2926a [DLAB-596]: Fixed issue with header structure after Dataengine creation with custom Spark configuration new aff5303 Merge pull request #89 from apache/DLAB-596 new 404eb3c [DLAB-597]: Fixed issue with getting list of Service Accounts new 8dae908 Merge pull request #90 from apache/DLAB-597-fix new bdc7fea DLAB-453 added possibility to terminate computational by scheduler new d1842f7 Merge pull request #91 from apache/feature-DLAB-453-1 new 9260408 EPMCDLAB-000 refactored ldap authentication new d2a1a40 DLAB-000 fixed merge conflicts new 875566d DLAB-000 copyright updated new 85f0db8 Merge pull request #92 from apache/ldab_refactored new 22aba18 [DLAB-600]: Fixed issue with missed tags new bbf8b59 Merge pull request #93 from apache/DLAB-600 new 8d86774 [DLAB-592]: use DataProc v1.4 instead of v1.1 new 4bfaf01 Merge pull request #94 from apache/DLAB-592 new bbf373e DLAB-602 fixed bug connected with wrong error message in case of wrong user login entered new b6e7f8a Merge pull request #95 from apache/bugfix-DLAB-602-1 new 4c04126 [DLAB-580] Removed n