Daniel Wallace
4d0bbc71ce
fix grammer
2018-05-08 11:18:31 -05:00
Daniel Wallace
05ab624fcd
Allow for passing in previously compiled grains to custom grain modules
...
Closes #47338
2018-04-27 15:22:38 -05:00
rallytime
08c71f13e4
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- doc/ref/configuration/minion.rst
- doc/topics/thorium/index.rst
- salt/beacons/__init__.py
- salt/client/mixins.py
- salt/client/ssh/wrapper/state.py
- salt/daemons/masterapi.py
- salt/grains/extra.py
- salt/minion.py
- salt/modules/cron.py
- salt/modules/file.py
- salt/modules/mac_user.py
- salt/modules/napalm_network.py
- salt/modules/state.py
- salt/modules/win_file.py
- salt/modules/win_pkg.py
- salt/proxy/dummy.py
- salt/state.py
- salt/states/file.py
- salt/states/lxc.py
- salt/utils/__init__.py
- salt/utils/schedule.py
- tests/integration/modules/test_file.py
- tests/integration/modules/test_groupadd.py
- tests/integration/ssh/test_state.py
- tests/integration/states/test_file.py
- tests/unit/daemons/test_masterapi.py
- tests/unit/grains/test_core.py
- tests/unit/modules/test_disk.py
- tests/unit/modules/test_napalm_network.py
- tests/unit/modules/test_state.py
- tests/unit/test_minion.py
- tests/unit/utils/test_process.py
2017-12-11 18:24:41 -05:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/reg.py
- salt/modules/state.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/utils/__init__.py
- tests/integration/modules/test_file.py
- tests/integration/output/test_output.py
- tests/unit/grains/test_core.py
2017-12-01 11:12:44 -05:00
Nicole Thomas
04b97bcfad
Merge pull request #44663 from whytewolf/ZD1777_ensure_understanding_of_minion_config_over_grains_file
...
Update notes around grains topic, and salt.modules.grains and salt.state.grains
2017-11-27 16:33:37 -05:00
Thomas Phipps
7fb208b5ad
Update note in topics/grains to reflect that not all grains are ignored.
...
only those set in the minion config
also update header of salt.modules.grains to more closely match what
states says in regard to this.
and tweak the note portion to stand out a bit more.
tweaked the state note to also stand out more
2017-11-22 15:17:45 -08:00
Mircea Ulinic
0320174ea4
Add doc note regarding static grains on proxy minions
2017-11-15 13:19:03 +00:00
Thomas Phipps
d148e39dda
change from md to rst for code reference
2017-11-13 15:15:13 -07:00
Thomas Phipps
955e305bda
fix bad english, as requested by cachedout
2017-11-13 11:49:30 -07:00
Thomas Phipps
7256fcc1c9
update note to take into account grains_cache
2017-11-08 16:36:38 -08:00
Thomas Phipps
aca0405b26
add a note that describes grain rebuilding on restart and refresh
2017-11-07 14:51:32 -08:00
Tshepang Lekhonkhobe
a29045846d
doc: make examples consistent with each other
...
Also, show a more complex example, which makes removing the templating necessary
2017-05-04 19:04:20 +02:00
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
