You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/10/18 16:02:17 UTC
[airavata] branch develop updated (fa948f2 -> 5c5aee0)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from fa948f2 Adding interactwel-django-app to interactwel django portal
add 8c731c7 Updated the SSH key for search SRA
new 415f441 AIRAVATA-3235 Default creationTime to current time
new 5c5aee0 Merge branch 'airavata-3235' into develop
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.
Summary of changes:
.../ansible/inventories/scigap/staging/host_vars/searchsra/vars.yml | 2 +-
.../registry/core/entities/appcatalog/ResourceJobManagerEntity.java | 3 ++-
.../registry/core/entities/appcatalog/SshJobSubmissionEntity.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
[airavata] 01/02: AIRAVATA-3235 Default creationTime to current time
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 415f4419294c29872508d93c38c05ab938bbe927
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Oct 18 12:01:33 2019 -0400
AIRAVATA-3235 Default creationTime to current time
---
.../registry/core/entities/appcatalog/ResourceJobManagerEntity.java | 3 ++-
.../registry/core/entities/appcatalog/SshJobSubmissionEntity.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
index 681d420..69f1f7b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ResourceJobManagerEntity.java
@@ -20,6 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
import javax.persistence.*;
@@ -39,7 +40,7 @@ public class ResourceJobManagerEntity implements Serializable {
private String resourceJobManagerId;
@Column(name = "CREATION_TIME", nullable = false, updatable = false)
- private Timestamp creationTime;
+ private Timestamp creationTime = AiravataUtils.getCurrentTimestamp();
@Column(name = "JOB_MANAGER_BIN_PATH")
private String jobManagerBinPath;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
index c8f8ea8..db7beeb 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/SshJobSubmissionEntity.java
@@ -20,6 +20,7 @@
*/
package org.apache.airavata.registry.core.entities.appcatalog;
+import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.data.movement.SecurityProtocol;
import javax.persistence.*;
@@ -48,7 +49,7 @@ public class SshJobSubmissionEntity implements Serializable {
private String alternativeSshHostname;
@Column(name="CREATION_TIME", nullable = false, updatable = false)
- private Timestamp creationTime;
+ private Timestamp creationTime = AiravataUtils.getCurrentTimestamp();
@Column(name="MONITOR_MODE")
private String monitorMode;
[airavata] 02/02: Merge branch 'airavata-3235' into develop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 5c5aee02041ac39778489e7c276772332b694a88
Merge: fa948f2 415f441
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Oct 18 12:01:44 2019 -0400
Merge branch 'airavata-3235' into develop
.../ansible/inventories/scigap/staging/host_vars/searchsra/vars.yml | 2 +-
.../registry/core/entities/appcatalog/ResourceJobManagerEntity.java | 3 ++-
.../registry/core/entities/appcatalog/SshJobSubmissionEntity.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)