valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Suggest a separate repo for top.sls.

Browse Source 
This replaces the suggestion to keep `top.sls` out of other branches
which is rather unpractical, as it would require to manually delete
it from each new created branch and prevent deleting it when merging
the branch back into `master`.
This commit is contained in:
Elias Probst 2015-03-08 09:46:10 +01:00
parent 0aa1029f24
commit 583239b893
No known key found for this signature in database
GPG Key ID: 82C512826511BADB
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/topics/tutorials/gitfs.rst
View File

@ -444,8 +444,8 @@ be used:
``top.sls`` files from different branches will be merged into one at runtime.
Since this can lead to overly complex configurations, the recommended setup is
to have the ``top.sls`` file only in the master branch and use
environment-specific branches for state definitions.
to have a separate repository, containing only the ``top.sls`` file with just
one single ``master`` branch.
To map a branch other than ``master`` as the ``base`` environment, use the
:conf_master:`gitfs_base` parameter.