Commit Graph

4734 Commits

Author SHA1 Message Date
Erik Johnson
b9fa443eba Update release notes with more information about winrepo changes 2015-08-09 17:42:13 -05:00
Erik Johnson
a7623b73ee Add notes about new features and deprecated option names 2015-08-09 17:42:13 -05:00
Erik Johnson
157b1c8b11 Add masterless winrepo config params to minion config docs 2015-08-09 17:42:13 -05:00
Erik Johnson
7ed679ad60 Add new winrepo config params to master config docs
Also fixed documentation for some of the gitfs and git_pillar config
params.
2015-08-09 17:42:13 -05:00
Erik Johnson
f5fd2729c2 Add ref to winrepo docs 2015-08-09 17:42:12 -05: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
Erik Johnson
8f1cac4226 Add notes about winrepo and dockerng changes 2015-08-04 14:22:10 -05:00
Justin Findlay
b794dbf7e4 autogenerated release notes for 2015.8.0rc3 2015-08-04 11:23:40 -06:00
Colton Myers
f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/windows/windows-package-manager.rst
    salt/modules/event.py
    salt/returners/carbon_return.py
    salt/state.py
    salt/states/pkg.py
2015-08-03 14:50:50 -06:00
Colton Myers
7b50807a12 Merge pull request #25902 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-03 14:30:07 -06:00
Justin Findlay
7e121de907 Update minion.rst 2015-07-31 17:34:07 -06:00
Jacob Hammons
ac0a8ff711 Doc on using syndic with multimaster 2015-07-31 15:25:15 -06:00
Mike Place
de0a0593c2 Merge pull request #25898 from jfindlay/syndic_doc
clarify and expand syndic docs
2015-07-31 14:01:23 -06:00
TheBigBear
c994d22696 Minor update to msi un-installer info
The ```uninstaller`` string can be either the windows GUID (aka msi prodcut code) OR the URL to the msi file. Both options work to uninstall a msi installed software.
2015-07-31 16:31:33 +01:00
TheBigBear
0d33bae104 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:24:04 -06:00
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
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