You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/09/19 19:48:27 UTC
[incubator-dlab] 01/04: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1056
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 032ad0dc8d17574407222cf126ba5fcf7d1455d2
Merge: 0e30fb4 eb0f287
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Sep 18 14:20:18 2019 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
.../src/general/lib/gcp/actions_lib.py | 2 +-
.../src/general/scripts/aws/deeplearning_configure.py | 14 +++++++-------
.../src/general/scripts/aws/jupyter_configure.py | 10 +++++-----
.../src/general/scripts/aws/rstudio_configure.py | 10 +++++-----
.../src/general/scripts/aws/tensor-rstudio_configure.py | 14 +++++++-------
.../src/general/scripts/aws/tensor_configure.py | 14 +++++++-------
.../src/general/scripts/aws/zeppelin_configure.py | 14 +++++++-------
.../src/general/scripts/azure/deeplearning_configure.py | 14 +++++++-------
.../src/general/scripts/azure/jupyter_configure.py | 10 +++++-----
.../src/general/scripts/azure/rstudio_configure.py | 10 +++++-----
.../src/general/scripts/azure/tensor_configure.py | 14 +++++++-------
.../src/general/scripts/azure/zeppelin_configure.py | 10 +++++-----
.../src/general/scripts/gcp/deeplearning_configure.py | 14 +++++++-------
.../src/general/scripts/gcp/jupyter_configure.py | 10 +++++-----
.../src/general/scripts/gcp/rstudio_configure.py | 10 +++++-----
.../src/general/scripts/gcp/tensor-rstudio_configure.py | 14 +++++++-------
.../src/general/scripts/gcp/tensor_configure.py | 14 +++++++-------
.../src/general/scripts/gcp/zeppelin_configure.py | 10 +++++-----
.../src/app/resources/scheduler/scheduler.component.ts | 2 +-
19 files changed, 105 insertions(+), 105 deletions(-)
diff --cc services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
index 7f17f06,d3b4d06..8120842
--- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
@@@ -256,10 -256,10 +256,10 @@@ export class SchedulerComponent impleme
}
private setScheduleByInactivity() {
- const data = { check_inactivity_required: this.enableIdleTime, max_inactivity: this.schedulerForm.controls.inactivityTime.value };
+ const data = {sync_start_required : this.parentInherit, check_inactivity_required: this.enableIdleTime, max_inactivity: this.schedulerForm.controls.inactivityTime.value };
(this.destination.type === 'СOMPUTATIONAL')
? this.setInactivity(this.notebook.name, data, this.destination.computational_name)
- : this.setInactivity(this.notebook.name, {...data, consider_inactivity: this.considerInactivity});
+ : this.setInactivity(this.notebook.name, { ...data, consider_inactivity: this.considerInactivity });
}
// public close(): void {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org