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
56,666 Commits 24 Branches 182 Tags 341 MiB
1889038af2
Commit Graph

4769 Commits

Author SHA1 Message Date
TheBigBear
333fbdde30 Update 7-zip msi un-installer instructions 
The instructions as-are do not actually work. The uninstaller flag takes the windows GUID of the msi product code. And the various ```install_flags``` and ```uninstall_flags``` do NOT need leading, or trailing spaces.

@twangboy can confirm this is a better example (also see salt issue #25778 https://github.com/saltstack/salt/issues/25778)
 2015-07-30 17:21:45 -06:00
Colton Myers
8abb21e206 Merge pull request #25894 from jacobhammons/bug-fixes 
Minor doc bug fixes
 2015-07-30 17:02:34 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Justin Findlay
4795952847 rework syndic doc 2015-07-30 16:33:18 -06:00
Jacob Hammons
3f3db4bd8e Additions for #24042 2015-07-30 15:43:21 -06:00
Jacob Hammons
db2129b199 Minor doc bug fixes 
Refs #24042
Refs #25650
Refs #21296
Refs #23788
 2015-07-30 14:39:15 -06:00
Thomas S Hatch
bf8bd38da7 Merge pull request #25871 from rallytime/bp-25829 
Back-port #25829 to 2015.5
 2015-07-30 11:33:42 -06:00
Thomas S Hatch
b6805b068a Merge pull request #25856 from jfindlay/intro_scale 
expand minion reauth scalability documentation
 2015-07-30 09:33:17 -06:00
Petr Demin
a80c47ee10 Fixed typo in salt.states.saltmod.function doc string 2015-07-30 09:27:14 -06:00
Justin Findlay
a25d0eabef update syndic doc to conform to style 2015-07-30 03:02:19 -06:00
Justin Findlay
5921461bb1 style and usage consistency in intro_scale 2015-07-30 01:11:22 -06:00
Justin Findlay
51dc7cacfb whitespace adjustments in intro_scale 2015-07-29 23:28:27 -06:00
Justin Findlay
39a82467f1 expand minion reauth scalability documentation 
Related to #25447.
 2015-07-29 23:26:51 -06:00
Justin Findlay
d377f42c48 rework deprecation documentation for release names 
Fixes #25827.
 2015-07-29 15:50:33 -06:00
Jacob Hammons
0e02191f61 regenerated man pages 2015-07-29 10:24:47 -06:00
Justin Findlay
d73964ea3c add console_log_fmt color documentation 2015-07-28 16:16:29 -06:00
Mike Place
737fb1410c Merge pull request #25796 from cachedout/debug_doc 
Remove debug from docs
 2015-07-28 11:35:58 -06:00
Mike Place
33bfdf3b0b Remove debug from docs 2015-07-28 11:35:32 -06:00
Nicole Thomas
13c2377e95 Merge pull request #25764 from gtmanfred/2015.8 
allow use of cloudnetworks in ssh_interface
 2015-07-27 20:40:06 -06:00
Daniel Wallace
51859396d4 add a note in the documentation for openstack 
about the cloud networks in ssh_interfaces
 2015-07-27 16:01:35 -05:00
Thomas S Hatch
29c66d85a4 Merge pull request #25740 from rallytime/bp-25722 
Back-port #25722 to 2015.5
 2015-07-27 10:08:40 -06:00
Alexey Pakseykin
c33eb813ea Change docs for --static option with JSON - text B 2015-07-27 09:00:59 -06:00
Alexey Pakseykin
89dd2ec8fb Change docs for --static option with JSON - text A 2015-07-27 09:00:59 -06:00
Mike Place
0dc28ad3e4 Return to str for master_type for 2015.5 2015-07-24 11:55:56 -06:00
David\ Beitey
f65397036f Fix doc around Include/Exclude for states 2015-07-24 09:42:25 +10:00
Colton Myers
882d11836b Update release candidate docs to 2015.8.0rc2 2015-07-23 14:29:09 -06:00
Justin Findlay
b27378b186 add 2015.8.0rc2 autogenerated changelog 2015-07-23 11:04:18 -06:00
Metin OSMAN
f8b2f8079f Add the ability to specify a base pattern for metrics path used by the carbon returner 2015-07-23 13:13:01 +02:00
Mike Place
8cef61e6cc pillar doc fix 
closes #25413
 2015-07-22 16:56:53 -06:00
Mike Place
bc2321a5c6 Merge pull request #25595 from terminalmage/git_pillar-rewrite 
Bring git_pillar up to feature parity with gitfs
 2015-07-22 10:55:13 -06:00
Mike Place
3fe4a75a7f Merge pull request #25578 from davidjb/relative-includes 
Allow parent relative includes in state files
 2015-07-22 10:51:12 -06:00
Erik Johnson
d109fce299 Add git_pillar rewrite info to release notes 2015-07-21 16:46:15 -05:00
Erik Johnson
a2fc11ef57 Add new git_pillar configuration docs 2015-07-21 16:46:14 -05:00
David\ Beitey
9ad0ddc549 Allow parent relative includes in state files 
This implements the solution to #25477.  Any ``include`` directives
within state files can use multiple dot notation (influenced by Python
relative imports) to refer to a parent state.

This also implements the same functionality inside the stateconf
renderer
(http://docs.saltstack.com/en/latest/ref/renderers/all/salt.renderers.stateconf.html),
which supported relative includes, excludes, and prefixed states.  This
PR expands on existing tests for stateconf.

This also updates the documentation accordingly.
 2015-07-21 16:32:38 +10:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
Joseph Hall
725d1a40d0 Merge pull request #25519 from rallytime/backport_vmware 
Backport vmware driver to 2015.5 branch
 2015-07-20 09:11:26 -06:00
David Beitey
3e24381439 Fix minor typo in best practice example 2015-07-18 08:24:53 -06:00
David\ Beitey
bfc4f9fd85 Fix typo in extend declaration doco 2015-07-18 14:39:29 +10:00
rallytime
35e13eef1d Don't reference driver in older salt versions 2015-07-17 11:00:57 -06:00
rallytime
f011890217 Add vmware back-port change to release notes 2015-07-17 10:58:38 -06:00
rallytime
0f4f560b38 Backport vmware driver to 2015.5 branch 2015-07-17 10:53:42 -06:00
Jeff Quast
e947d8ec5a docfix: "cache_jobs: False" => grains_cache: False" 
At the currently rendered anchor link: http://docs.saltstack.com/en/latest/ref/configuration/minion.html#grains-cache

We see the use of "cache_jobs" in the yaml example for the section describing "grains_cache"
 2015-07-16 09:24:07 -06:00
Thomas S Hatch
4f91f5b32e Merge pull request #25439 from rallytime/fix-25431 
Reduce digital_ocean API call frequency
 2015-07-15 13:40:24 -06:00
rallytime
7138f36d05 Add page number change to release notes 2015-07-15 10:48:23 -06:00
rallytime
faf49ea2a3 Add page number change release notes 2015-07-15 10:44:57 -06:00
Colton Myers
2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/requisites.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/config.py
    salt/minion.py
    salt/modules/cp.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-07-14 10:57:36 -06:00
Arnold Bechtoldt
3e2edd33d4 refactor elasticsearch integration 
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
 2015-07-14 09:00:26 -06:00
Jarpy
da9c0eb673 Typo in client_acl ref doc. 2015-07-14 08:54:32 -06:00
Jarpy
50e0baf270 Demonstrate per-minion client_acl. 
The client_acl system supports setting restrictions based on minion name.
Update the Client ACL System reference page to reflect this.
 2015-07-14 08:54:32 -06:00
Mike Place
71859c6593 Merge pull request #25339 from jfindlay/orch_doc 
update orchestration docs
 2015-07-13 10:04:25 -06:00
Arnold Bechtoldt
8eb2ac1dbe set correct indention in states/requisites.rst (docs), fixes #25281 2015-07-11 18:25:20 +02:00
Justin Findlay
0447808d95 clarify, motivate orchestration docs 2015-07-10 17:03:27 -06:00
Jacob Hammons
88f5fcf58d Latest help theme updates 2015-07-10 09:52:01 -06:00
Jacob Hammons
19f88920fa version change to 2015.5.3 2015-07-10 09:43:15 -06:00
rallytime
7795670bdc Remove Beryllium Deprecation Warnings 2015-07-10 09:27:50 -06:00
jacobhammons
cd405b440e Merge pull request #25257 from notpeter/SourceDestCheck 
Document SourceDestCheck added in #25242.
 2015-07-09 17:29:48 -06:00
C. R. Oldham
58ca83cda1 Merge pull request #25254 from rallytime/change_beryllium_refs 
Change versionadded/changed references from Beryllium to 2015.8.0
 2015-07-09 15:01:15 -06:00
Jacob Hammons
f6561289af bug fix for module function display in help 2015-07-09 14:13:29 -06:00
Jacob Hammons
57dfa92d5a Fixed typos 2015-07-08 21:12:24 -06:00
Jacob Hammons
2f9e5b9125 Additional docs on external and master job cache, assorted doc fixes 
Refs #25277
 2015-07-08 20:33:34 -06:00
Colton Myers
3a7289a0cb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/all/salt.states.aptpkg.rst
    doc/ref/states/all/salt.states.etcd_mod.rst
    doc/topics/releases/releasecandidate.rst
    salt/client/mixins.py
    salt/modules/win_pkg.py
    tests/unit/modules/boto_vpc_test.py
 2015-07-08 16:24:58 -06:00
Peter Tripp
72323fcac9 Document SourceDestCheck added in #25242. 2015-07-08 12:31:36 -07:00
rallytime
1b7efa91e0 Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
Jacob Hammons
0a46dc4c40 Built man page for spm, added man page entry for spm to doc/conf.py 
Refs #25213
 2015-07-07 20:48:58 -06:00
rallytime
d0b61f3fc1 A couple of doc fixes for the http tutorial 2015-07-07 15:12:36 -06:00
Colton Myers
452880d4aa Update releasecandidate docs 2015-07-07 09:24:57 -06:00
Justin Findlay
fbafd39a46 Merge pull request #25187 from UtahDave/fix_misspelling 
Doc fixes: Fix misspelling and remove extraneous double spaces
 2015-07-06 19:07:04 -06:00
Nicole Thomas
4a406aca45 Merge pull request #25180 from rallytime/bp-25088 
Back-port #25088 to 2015.5
 2015-07-06 14:33:45 -06:00
David Boucha
65abb63003 remove some extraneous double spaces 2015-07-06 10:48:04 -06:00
David Boucha
c423b62aa5 fix misspelling 2015-07-06 10:46:18 -06:00
Tom Melendez
4078c8db25 added message recommending JSON file be used if the libcloud version is >= 0.17.0 2015-07-06 10:07:16 -06:00
rallytime
c0c2463b64 Partial backport of #25019 
Only backport the new .rst files for states that exist in the 2015.5 branch

Refs #25019
 2015-07-06 09:28:43 -06:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Justin Findlay
576f1b8493 Merge pull request #25008 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-07-01 19:04:59 -06:00
Justin Findlay
3187d5d5aa add 2015.5.3 release notes 2015-07-01 13:43:30 -06:00
Mike Place
7c8d2a8656 Merge pull request #25089 from jfindlay/fix_sudo 
fix minion sudo
 2015-07-01 09:53:16 -06:00
Joseph Hall
1e4f7aa574 Add man page for spm, change pillar to .orig 2015-06-30 09:45:13 -06:00
Joseph Hall
393cbf2114 Document pillars and loader modules 2015-06-30 07:16:58 -06:00
lorengordon
40a0c132d4 Add download links for 2015.5.1-3 and 2015.5.2, Fixes #25057 2015-06-30 07:48:21 -04:00
Justin Findlay
44cb167744 adding sudo_user minion config docs 2015-06-30 03:10:56 -06:00
Colton Myers
99fc7ecb4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/fileclient.py
    salt/modules/file.py
    salt/modules/gpg.py
 2015-06-29 16:49:40 -06:00
Thomas S Hatch
337a5fe4e9 Merge pull request #24980 from UtahDave/templatize_winrepo 
Templatize winrepo on the minion
 2015-06-29 09:44:49 -07:00
Joseph Hall
64cdd85584 Merge pull request #25023 from pengyao/schedule_typo 
fixed a typo
 2015-06-28 07:25:48 -06:00
pengyao
083f879afd a typo 2015-06-28 20:27:49 +08:00
Justin Findlay
8575192cc4 revise label and milestone documentation 2015-06-27 16:17:44 -06:00
Arnold Bechtoldt
689ba5686b add missing module documentation to references 2015-06-27 19:12:50 +02:00
jacobhammons
91a60e198e Merge pull request #25003 from jacobhammons/man-pages 
Updated man pages
 2015-06-26 13:13:41 -06:00
Jacob Hammons
cf97a4ab17 Updated man pages 2015-06-26 12:21:26 -06:00
Jacob Hammons
f88f344a28 sphinx html theme updates 2015-06-26 11:13:56 -06:00
Jacob Hammons
30a907576c rebuilt man pages, versioned html theme css 2015-06-26 11:06:21 -06:00
David Boucha
99d2fd109a update docs to reflect new win rep changes 2015-06-26 09:58:47 -06:00
Jacob Hammons
1587d56bf0 Fixed doc/index.rst 2015-06-26 08:44:14 -06:00
Jacob Hammons
8be40d9d40 sphinx html theme updates - additional fix, updated index file 2015-06-26 08:35:20 -06:00
Jacob Hammons
01e96bca11 sphinx html theme updates - color changes for warning on development branch 2015-06-26 08:23:58 -06:00
Nicole Thomas
a15f9f8b56 Merge pull request #24971 from rallytime/azure_min_ver 
Add minimum Python Azure SDK version to azure docs.
 2015-06-25 17:18:22 -06:00
Colton Myers
f65e663353 Merge pull request #24937 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-25 16:03:47 -06:00
Mike Place
fbea069319 Remove duplicate func doc 
Closes #23613
 2015-06-25 15:48:44 -06:00
rallytime
4ac8a9460a Add minimum Python Azure SDK verion to azure docs. 2015-06-25 15:26:50 -06:00
Justin Findlay
152a9b2a12 fix some malformed doc links and anchors 2015-06-24 16:56:52 -06:00
Colton Myers
acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/utils/cloud.py
    salt/utils/job.py
 2015-06-24 11:44:04 -06:00