mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 01:18:58 +00:00
95a38461fe
This is the simplest method of preserving the commit history for each file from the salt-cloud repository, although the --follow flag must be given to git log in order to view the full history. This change allows for performing a regular git merge from within the Salt repo without any merge conflicts occuring (since the salt_cloud dir doesn't exist there).
17 lines
1.3 KiB
Plaintext
17 lines
1.3 KiB
Plaintext
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/Arch-git.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/Arch.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/Fedora-git.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/Fedora.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/FreeBSD-git.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/FreeBSD.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/None.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/RHEL5-git.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/RHEL5.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/RHEL6-git.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/RHEL6.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/SmartOS.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/Ubuntu-git.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/Ubuntu.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/Debian-git.sh
|
|
salt-cloud: script-not-executable usr/share/pyshared/saltcloud/deploy/Debian.sh
|