Merge pull request #32210 from rallytime/merge-32193

Merge #32193 with pylint fix
This commit is contained in:
Nicole Thomas 2016-03-29 09:10:36 -06:00
commit dbb95381fb

View File

@ -30,7 +30,7 @@ Salt always executes states in a finite manner, meaning that they will always
execute in the same order regardless of the system that is executing them.
But in Salt 0.17.0, the ``state_auto_order`` option was added. This option
makes states get evaluated in the order in which they are defined in sls
files.
files, including the top.sls file.
The evaluation order makes it easy to know what order the states will be
executed in, but it is important to note that the requisite system will