rallytime
|
494a06bee2
|
Merge branch '2016.11' into 'develop'
Conflicts:
- doc/ref/configuration/minion.rst
|
2016-12-20 10:03:44 -07:00 |
|
rallytime
|
4aafa41d22
|
Remove ":doc:" references from a bunch of doc/* files
|
2016-12-15 16:09:27 -07:00 |
|
Oz N Tiram
|
1ac9b96a76
|
Update grains documentation
Make it clear that changes to grains content require
a refersh of modules.
|
2016-11-12 10:45:39 +01:00 |
|
Oz N Tiram
|
c03a184212
|
Make it clear that grains can exist in one place in only
|
2016-11-02 10:03:15 +01:00 |
|
Erik Johnson
|
854586c6a4
|
Add one more paragraph
|
2016-10-17 17:20:57 -05:00 |
|
Erik Johnson
|
a0502a7b90
|
Restructure grain writing docs
Some information recently added is a little redundant. This commit edits
it and restructures the information to make it flow better.
|
2016-10-17 17:03:05 -05:00 |
|
Erik Johnson
|
4e419e90ac
|
Further clarification on new grains docs from #37028
|
2016-10-17 11:44:35 -05:00 |
|
Damon Atkins
|
01e83a715e
|
doc/topics/grains Update doco on when a grain should be created
|
2016-10-17 16:59:15 +11:00 |
|
Damon Atkins
|
a0e1fcc951
|
Add information to consider before adding a Grain to doco's for Grains
|
2016-10-16 01:17:38 +11:00 |
|
rallytime
|
80fcdfb9d8
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- doc/topics/targeting/grains.rst
- salt/cli/daemons.py
- salt/exceptions.py
- salt/minion.py
- salt/modules/schedule.py
- salt/scripts.py
- salt/states/archive.py
|
2016-04-26 12:07:42 -06:00 |
|
rallytime
|
b77993d9a1
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- doc/ref/configuration/minion.rst
- doc/topics/targeting/grains.rst
- salt/crypt.py
- salt/scripts.py
- salt/states/dockerng.py
- salt/states/pkg.py
|
2016-04-13 09:42:54 -06:00 |
|
Jacob Hammons
|
b192a9ba38
|
Doc restructuring, organization, and cleanup. Updated the doc navigation.
|
2016-01-31 20:10:02 -07:00 |
|