mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +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).
5 lines
124 B
Plaintext
5 lines
124 B
Plaintext
usr/lib/python2*/dist-packages/saltcloud/
|
|
conf/cloud /etc/salt
|
|
conf/* /usr/share/doc/salt-cloud/examples
|
|
scripts/* /usr/bin
|