Skip to content
Snippets Groups Projects
Commit 6f296309 authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Merge remote-tracking branch 'origin/develop' into...

Merge remote-tracking branch 'origin/develop' into 302-move-application-availability-checks-from-janitor-to-platform

# Conflicts:
#	src/test/shell/data/i18n/de.json
#	src/test/shell/data/i18n/en.json
#	src/test/shell/data/i18n/fr.json
#	src/test/shell/data/i18n/pl.json
parents 63d810e1 a7d5ed0d
No related branches found
No related tags found
2 merge requests!273Release 1.8.0 update,!244"Move application availability checks from Janitor to Platform"
Pipeline #94874 passed
......@@ -111,7 +111,7 @@ dependencies {
runtimeOnly('org.postgresql:postgresql')
// Database audit trail
implementation 'org.hibernate.orm:hibernate-envers:6.6.17.Final'
implementation 'org.hibernate.orm:hibernate-envers:6.6.18.Final'
// Database migrations
implementation('org.flywaydb:flyway-core:11.9.1')
......
......@@ -203,7 +203,9 @@
"STEP_3" : "Advanced cluster settings",
"STEP_1_INFO" : "Kubernetes configuration is required to proceed. Please paste the content of the .kuberconfig file in the text area.",
"STEP_2_INFO" : "Provide basic information about the new cluster and assign it to one of Your domains.",
"STEP_3_INFO" : "Cluster Ingress and Storage properties were populated with default values. Update it according to your remote cluster configuration."
"STEP_3_INFO" : "Cluster Ingress and Storage properties were populated with default values. Update it according to your remote cluster configuration.",
"TOOLTIP_1" : "You need to add kubernetes config file to proceed",
"TOOLTIP_2" : "All fields must be fill"
}
},
"GITLAB": {
......
......@@ -204,7 +204,9 @@
"STEP_3" : "Advanced cluster settings",
"STEP_1_INFO" : "Kubernetes configuration is required to proceed. Please paste the content of the .kuberconfig file in the text area.",
"STEP_2_INFO" : "Provide basic information about the new cluster and assign it to one of Your domains.",
"STEP_3_INFO" : "Cluster Ingress and Storage properties were populated with default values. Update it according to your remote cluster configuration."
"STEP_3_INFO" : "Cluster Ingress and Storage properties were populated with default values. Update it according to your remote cluster configuration.",
"TOOLTIP_1" : "You need to add kubernetes config file to proceed",
"TOOLTIP_2" : "All fields must be fill"
}
},
"GITLAB": {
......
......@@ -205,7 +205,9 @@
"STEP_3" : "Advanced cluster settings",
"STEP_1_INFO" : "Kubernetes configuration is required to proceed. Please paste the content of the .kuberconfig file in the text area.",
"STEP_2_INFO" : "Provide basic information about the new cluster and assign it to one of Your domains.",
"STEP_3_INFO" : "Cluster Ingress and Storage properties were populated with default values. Update it according to your remote cluster configuration."
"STEP_3_INFO" : "Cluster Ingress and Storage properties were populated with default values. Update it according to your remote cluster configuration.",
"TOOLTIP_1" : "You need to add kubernetes config file to proceed",
"TOOLTIP_2" : "All fields must be fill"
}
},
"GITLAB": {
......
......@@ -204,7 +204,9 @@
"STEP_3" : "Advanced cluster settings",
"STEP_1_INFO" : "Kubernetes configuration is required to proceed. Please paste the content of the .kuberconfig file in the text area.",
"STEP_2_INFO" : "Provide basic information about the new cluster and assign it to one of Your domains.",
"STEP_3_INFO" : "Cluster Ingress and Storage properties were populated with default values. Update it according to your remote cluster configuration."
"STEP_3_INFO" : "Cluster Ingress and Storage properties were populated with default values. Update it according to your remote cluster configuration.",
"TOOLTIP_1" : "You need to add kubernetes config file to proceed",
"TOOLTIP_2" : "All fields must be fill"
}
},
"GITLAB": {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment