rallytime
1b04f0ddec
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- doc/ref/configuration/minion.rst
- doc/ref/modules/all/index.rst
- doc/ref/modules/index.rst
- salt/modules/systemd.py
- salt/modules/zypper.py
2016-04-11 11:33:08 -06:00
Erik Johnson
f9306347cc
Clarify the scope of the provider param in states.
2016-04-08 22:05:36 -05:00
Erik Johnson
f0de1236ec
Move the tables of virtual modules to individual documentation pages
2016-04-08 21:58:11 -05:00
Nicole Thomas
ab8b70d985
Merge pull request #32212 from rallytime/bp-32197
...
Back-port #32197 to 2015.8
2016-03-29 09:50:58 -06:00
Todd Wells
5fdd81ace9
documentation fix issue 31844
2016-03-29 09:11:29 -06:00
Todd Wells
abd432746c
documentation-fix-31931
2016-03-29 09:08:58 -06:00
rallytime
7554d0f42d
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- doc/ref/states/include.rst
- doc/topics/cloud/reactor.rst
- doc/topics/reactor/index.rst
- doc/topics/releases/2015.5.10.rst
- doc/topics/tutorials/states_pt5.rst
- doc/topics/windows/windows-package-manager.rst
- salt/config.py
- salt/modules/state.py
- salt/states/grains.py
- tests/integration/modules/sysmod.py
- tests/unit/states/grains_test.py
2016-03-24 15:48:00 -06:00
Thomas Güttler
4a3a6629ce
"Fire Event Notifications" moved down
...
it is less important. "Requisites" is what the page is about.
2016-03-23 13:57:45 -06:00
Erik Johnson
1b97e4a3df
Improve state module docs, replace references to state.highstate/state.sls with state.apply
...
Resolves #32037 .
2016-03-21 22:56:17 -05:00
rallytime
1a1ce05186
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- .testing.pylintrc
- salt/cloud/clouds/joyent.py
2016-03-15 12:34:57 -06:00
Seth House
cb72b19240
Fix outdated Jinja 'env' variable reference
2016-03-10 19:48:42 -07:00
Denys Havrysh
aebc48163d
Remove trailing white spaces in documentation files
2016-03-01 17:36:23 +02:00
Jacob Hammons
a72dc15720
Assorted doc issues
...
Fixes #10330
Fixes #31216
Fixes #30464
Fixes #29520
Fixes #30261
Fixes #29636
Fixes #29528
2016-02-24 16:56:52 -07:00
Kyle Stapp
87f4843490
Clarified the form of requisite targets/requisite-references
2016-02-24 10:34:03 -05:00
rallytime
33eb6ba125
Remove overstate docs and a few references.
...
The overstate system was deprecated and removed in Beryllium, in
favor of orchestrate.
2016-02-08 09:28:32 -07:00
rallytime
57b7e6cc93
Add glance state to list of state modules
...
Fixes #30621
2016-01-25 12:35:19 -07:00
Jacob Hammons
0d2111d397
Assorted doc bug fixes
...
Refs #4381
Refs #8146
Refs #13036
Refs #6853
Refs #9319
Refs #13777
Refs #2229
Refs #14946
Refs #15042
2016-01-07 14:08:30 -07:00
rallytime
e7c5863468
Add esxi module and state to docs build
...
Also fixed some minor doc errors
2015-12-17 16:33:59 -07:00
rallytime
45b77fb288
Add note about shell truthiness vs python truthiness
2015-12-15 16:14:31 -07:00
rallytime
3bfb87c031
Spelling fixes
2015-12-15 15:45:19 -07:00
rallytime
15c466cc12
Further clarifications on "unless" and "onlyif" requisites.
...
Fixes #14634
- "unless" is actually a NAND operator
- remove usage of "opposite of unless" as that is confusing
2015-12-15 15:42:56 -07:00
rallytime
eec9d69387
Merge branch '2015.5' into '2015.8'
...
Conflicts:
salt/modules/virtualenv_mod.py
salt/states/file.py
tests/integration/__init__.py
2015-11-04 15:52:59 -07:00
rallytime
be8f650901
Punctuation.
2015-11-02 19:30:58 -06:00
rallytime
fd846822c1
Add state_auto_order defaults to True note to ordering docs
...
Fixes #28243
2015-11-02 19:29:32 -06:00
C. R. Oldham
3712066fc9
More docs.
2015-10-19 13:19:20 -06:00
C. R. Oldham
4ce2f8bb11
Documentation.
2015-10-16 16:52:14 -06:00
Daniel Hahler
98a8c0f055
doc: minor fixes to doc and comments
2015-10-02 01:18:32 +02:00
Jonathan Ballet
97e69ebb97
doc: fix state's top documentation typo
2015-09-25 12:16:48 -06:00
Arnold Bechtoldt
3a7d31a91c
add missing module references
2015-09-20 13:22:32 +02:00
Jacob Hammons
f7a9e25d52
Fixed sphinx / latex build warnings and errors
...
Added missing modules to contents
2015-09-17 09:23:24 -06:00
Justin Findlay
0d62d3470c
Merge pull request #27111 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-15 01:29:30 -06:00
Jacob Hammons
d939a38c8c
release notes updates
2015-09-14 14:52:14 -06:00
Colton Myers
274464a85b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/reactor/index.rst
salt/cloud/clouds/digital_ocean_v2.py
salt/modules/groupadd.py
salt/modules/localemod.py
salt/modules/mysql.py
salt/modules/useradd.py
salt/modules/win_pkg.py
salt/modules/win_useradd.py
salt/netapi/rest_cherrypy/app.py
salt/pillar/s3.py
salt/returners/local_cache.py
salt/states/htpasswd.py
salt/states/user.py
2015-09-14 14:39:03 -06:00
Jacob Hammons
ac3bd47440
states/pkgrepo examples, suse installation updates
...
Refs #26644
Refs #26638
2015-09-02 11:37:40 -06:00
Colton Myers
1e1f5f3a95
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/cloud/config.rst
doc/topics/cloud/index.rst
salt/modules/git.py
salt/states/git.py
salt/states/pkgrepo.py
2015-09-01 15:35:21 -06:00
Jacob Hammons
0ec036350d
Updates to salt-ssh and salt-key
...
#24510
2015-08-31 20:00:30 -06:00
Jacob Hammons
45c1ff3543
Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates.
...
Refs #21214
2015-08-31 13:51:31 -06:00
Justin Findlay
1d404bd561
remove trailing whitespace in state top docs
2015-08-26 01:44:33 -06:00
Justin Findlay
a288962ac2
change md code quoting to rst in state top docs
2015-08-26 01:44:33 -06:00
Justin Findlay
559512b0a6
add default_top description to docs
2015-08-26 01:44:33 -06:00
Colton Myers
2907a64052
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cli/batch.py
salt/modules/git.py
salt/utils/event.py
2015-08-20 13:31:46 -06:00
Jacob Hammons
499bd66378
Minor doc bug fixes
...
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
2015-08-19 11:31:26 -06:00
Erik Johnson
56fc78de80
Hide aliased funcs from docs
2015-08-17 17:29:13 -05:00
Seth House
4471c3f237
Add note about top-file only env assignment and the show_top() function
2015-08-11 11:29:33 -06:00
Seth House
5864111429
Minor spelling, style fixes
2015-08-11 11:29:25 -06:00
Mike Place
cfb6982227
Adding some dictupdate merge tests
...
Add new option for top_file_merging_strategy to config
Add master config file option
Adding additional tests
Lexicographical test works
Make default strategy
Simplify to just an option about whether or not to merge
Changes
Implement ordered top files
Implement merge strategies and default top files
Lint
Doc rewrite and start on ordering
Remove debugging
Moving to env_order
Adding env_order
Still writing tests
More tests and docs
2015-08-11 11:28:40 -06:00
Colton Myers
a4d4f8c5f8
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/linode.py
salt/modules/layman.py
salt/modules/win_system.py
2015-08-05 15:30:04 -06:00
Justin Findlay
a83059ca01
fix test mode logic in state docs
2015-08-05 11:29:56 -06:00
Justin Findlay
0fd180e106
add test logic to state reult doc
2015-08-05 09:36:08 -06:00
David\ Beitey
f65397036f
Fix doc around Include/Exclude for states
2015-07-24 09:42:25 +10:00
