Fixed merge conflicts (266e0dde) · Commits · Chris Hines / ansible_cluster_in_a_box · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

266e0dde

Commit 266e0dde authored 10 years ago by Jupiter Hu

Downloads
- Plain Diff

Fixed merge conflicts

parents 81e134ac fa3117e7

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

roles/easy-rsa-certificate/tasks/buildCert.yml 4 additions, 0 deletions

roles/easy-rsa-certificate/tasks/buildCert.yml
roles/slurm-build/tasks/main.yml 1 addition, 1 deletion

roles/slurm-build/tasks/main.yml
roles/syncExports/templates/exports.j2 10 additions, 3 deletions

roles/syncExports/templates/exports.j2
roles/vncserver/tasks/main.yml 20 additions, 0 deletions

roles/vncserver/tasks/main.yml
roles/vncserver/vars/CentOS_x86_64.yml 4 additions, 0 deletions

roles/vncserver/vars/CentOS_x86_64.yml
roles/vncserver/vars/Ubuntu_x86_64.yml 7 additions, 0 deletions

roles/vncserver/vars/Ubuntu_x86_64.yml

with 46 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