Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-sb-devops
Commits
a49996cd
Unverified
Commit
a49996cd
authored
5 years ago
by
Keshav Prasad
Committed by
GitHub
5 years ago
Browse files
Options
Download
Plain Diff
Merge branch 'release-2.5.0' into scheduler-time-update
parents
0777b309
4d0e15ea
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
ansible/artifacts/sunbird/login/info.ftl
+1
-0
ansible/artifacts/sunbird/login/info.ftl
ansible/artifacts/sunbird/login/login-page-expired.ftl
+1
-0
ansible/artifacts/sunbird/login/login-page-expired.ftl
ansible/artifacts/sunbird/login/login-reset-password.ftl
+1
-0
ansible/artifacts/sunbird/login/login-reset-password.ftl
ansible/artifacts/sunbird/login/login-update-password.ftl
+1
-0
ansible/artifacts/sunbird/login/login-update-password.ftl
ansible/artifacts/sunbird/login/login.ftl
+3
-1
ansible/artifacts/sunbird/login/login.ftl
ansible/artifacts/sunbird/login/messages/messages_en.properties
+9
-10
...e/artifacts/sunbird/login/messages/messages_en.properties
ansible/artifacts/sunbird/login/resources/js/login.js
+87
-27
ansible/artifacts/sunbird/login/resources/js/login.js
ansible/artifacts/sunbird/login/template.ftl
+1
-0
ansible/artifacts/sunbird/login/template.ftl
ansible/inventory/env/group_vars/all.yml
+5
-0
ansible/inventory/env/group_vars/all.yml
ansible/roles/es-mapping/files/indices/cert-templates.json
+177
-0
ansible/roles/es-mapping/files/indices/cert-templates.json
ansible/roles/es-mapping/files/mappings/cert-templates-mapping.json
+128
-0
...les/es-mapping/files/mappings/cert-templates-mapping.json
ansible/roles/es-mapping/files/mappings/course-batch-mapping.json
+3
-0
...roles/es-mapping/files/mappings/course-batch-mapping.json
ansible/roles/kong-api/defaults/main.yml
+80
-0
ansible/roles/kong-api/defaults/main.yml
ansible/roles/offline-installer/tasks/uploadToAzure.yml
+1
-1
ansible/roles/offline-installer/tasks/uploadToAzure.yml
ansible/roles/samza-jobs/defaults/main.yml
+7
-0
ansible/roles/samza-jobs/defaults/main.yml
ansible/roles/stack-proxy/defaults/main.yml
+1
-0
ansible/roles/stack-proxy/defaults/main.yml
ansible/roles/stack-proxy/templates/proxy-default.conf
+41
-0
ansible/roles/stack-proxy/templates/proxy-default.conf
ansible/roles/stack-sunbird/defaults/main.yml
+1
-0
ansible/roles/stack-sunbird/defaults/main.yml
ansible/roles/stack-sunbird/templates/sunbird_cert-service.env
+2
-1
...le/roles/stack-sunbird/templates/sunbird_cert-service.env
ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
+3
-1
...ble/roles/stack-sunbird/templates/sunbird_lms-service.env
with
553 additions
and
41 deletions
+553
-41
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets