resolved merge conflicts (fccb4d8f) · Commits · hpc-team / HPCasCode · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

H

HPCasCode
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

fccb4d8f

Commit fccb4d8f authored 5 years ago by Andreas Hamacher

Downloads
- Plain Diff

resolved merge conflicts

Former-commit-id: 840ccd6e

parents 3306ec82 1ea564f6

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 64 additions, 2 deletions

.gitlab-ci.yml
CICD/heat/gc_HOT.yaml 1 addition, 1 deletion

CICD/heat/gc_HOT.yaml
roles/cron-access/tasks/main.yml 8 additions, 0 deletions

roles/cron-access/tasks/main.yml
roles/mysql/tasks/mysql_server.yml 8 additions, 0 deletions

roles/mysql/tasks/mysql_server.yml
roles/set_timezone/README.md 13 additions, 0 deletions

roles/set_timezone/README.md
roles/set_timezone/tasks/main.yml 20 additions, 0 deletions

roles/set_timezone/tasks/main.yml
roles/set_timezone/templates/ntp.conf.j2 55 additions, 0 deletions

roles/set_timezone/templates/ntp.conf.j2
roles/set_timezone/vars/main.yml 3 additions, 0 deletions

roles/set_timezone/vars/main.yml
scripts/make_inventory.py 5 additions, 1 deletion

scripts/make_inventory.py

with 177 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment