valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
99,586 Commits 24 Branches 182 Tags 341 MiB
c3f4a701d4
Commit Graph

9002 Commits

Author SHA1 Message Date
Ch3LL
bf3f21721e
Update search engine IDs for releases 2018-10-25 16:47:41 -04:00
rallytime
d8e5e9ea49
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-10-25 16:16:10 -04:00
Ch3LL
3452d9bf01
change order of search engine ids 2018-10-25 16:11:35 -04:00
Ch3LL
c9546dfb08
Update search engine IDs for releases 2018-10-25 16:10:15 -04:00
rallytime
8fed338708
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/spm/pkgfiles/local.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-10-25 10:31:06 -04:00
rallytime
897145c4a1
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-24 15:54:15 -04:00
Nicole Thomas
88673ad9e7
Merge pull request #50208 from Ch3LL/2update_version_doc_2018.3 
Update release versions for the 2018.3 branch
 2018-10-24 11:52:18 -04:00
Nicole Thomas
85e22d2f25
Merge pull request #50207 from Ch3LL/2update_version_doc_2017.7 
Update release versions for the 2017.7 branch
 2018-10-24 11:51:12 -04:00
Ch3LL
896caa120f
Add 2016.11.10 release notes to 2018.3 branch 2018-10-24 11:08:38 -04:00
Ch3LL
cdbf493400
Add 2017.7.8 previous release 2018-10-24 10:39:04 -04:00
Ch3LL
198d25ca1d
Add 2017.7.8 previous release 2018-10-24 10:38:37 -04:00
Ch3LL
6f775e748a
Update release versions for the 2018.3 branch 2018-10-24 10:34:26 -04:00
Ch3LL
d4e26aceda
Update release versions for the 2017.7 branch 2018-10-24 10:34:24 -04:00
Ch3LL
1e3415860f
[2018.3.3] remove in progress and add security details 2018-10-24 10:31:16 -04:00
Ch3LL
71ee68b6f1
[2017.7.8] remove in progress and add security details 2018-10-24 10:27:39 -04:00
Erik Johnson
5ea1024b5d
Add documentation explaining naming convention for test files 2018-10-23 14:51:28 -05:00
Max Arnold
881a521586 Revert curly braces example for nested dictionaries 2018-10-23 23:25:08 +07:00
rallytime
b9f61323b5
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-10-22 14:41:20 -04:00
Nicole Thomas
aa66d1b7ba
Merge pull request #50158 from vutny/doc/2017.7/fix-http-tutorial 
[DOC] Fix JSON payload example in HTTP tutorial
 2018-10-22 14:37:51 -04:00
Denys Havrysh
fe2d70d4a3
[DOC] Fix JSON payload example in HTTP tutorial 2018-10-22 18:57:04 +03:00
Michael Lustfield
3a62f74758
Add support for setting root ssh pubkey to proxmox containers. 2018-10-20 19:03:40 -05:00
Mike Place
bfce09c2fe
Merge pull request #49937 from ssc-services/fix-virt-what-multiline-results 
Fix value of `virtual` grain when using `virt-what`
 2018-10-19 07:27:42 -06:00
Elias Probst
08b1b17465
Add release notes for virtual grain fix 2018-10-19 01:03:25 +02:00
rallytime
82e73fe49d
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/ref/tops/all/index.rst
  - salt/fileclient.py
  - salt/grains/core.py
  - salt/modules/win_file.py
  - salt/pillar/__init__.py
  - salt/utils/http.py
 2018-10-18 10:41:42 -04:00
Mike Place
f7f8cb533f
Merge pull request #50094 from rallytime/doc-errs 
Fix varstack_top naming in docs
 2018-10-18 12:49:24 +02:00
rallytime
1fbb84d934
Fix varstack_top naming in docs 
Warnings were generated in the doc builds about how `varstack` doesn't
exist. The file is named `varstack_top`.
 2018-10-17 10:31:45 -04:00
Mike Place
b94e0a01ac
Merge pull request #50055 from rallytime/bp-50024 
Back-port #50024 to 2018.3
 2018-10-16 11:14:06 +02:00
Mike Place
14f3fac0c4
Merge pull request #50056 from rallytime/bp-50029 
Back-port #50029 to 2018.3
 2018-10-16 11:12:58 +02:00
Daniel Wallace
4c4bb5a489
Merge pull request #49987 from terminalmage/pillar_roots 
Make Pillar no longer munge file_roots
 2018-10-15 16:58:08 -05:00
rallytime
1eaaab705f
Doc title formatting must match doc name length 2018-10-15 16:55:35 -04:00
Christian McHugh
6ac26b6c1e
add saltclass docs from release notes 2018-10-15 16:54:20 -04:00
rallytime
1b5b018da2
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/minion.py
  - salt/states/lvm.py
 2018-10-15 13:13:57 -04:00
Cody Crawford
2e46a783c5
Expose docs for Ansible modules 2018-10-15 13:01:22 -04:00
rwaweber
1ea72a00aa
docs: Correct spelling mistake and smooth out sentence 2018-10-15 12:58:28 -04:00
rallytime
e3a0f7b6f2
Add gce fix to 2017.7.9 release notes 2018-10-15 11:03:06 -04:00
Joachim Gleissner
e6d86fca91
document GCE instance credentials configuration 2018-10-15 11:02:25 -04:00
rallytime
f8e73e8ae2
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/beacons/inotify.py
 2018-10-10 15:13:23 -04:00
Erik Johnson
58f5fde03c
Make Pillar no longer munge file_roots 
Pillar and the local fileclient used to use the same class, but this
changed a few years ago with the introduction of FSClient (which enabled
non-roots fileserver backends in masterless Salt). Since Pillar is the
only thing that uses this client, there is no longer a reason to make
Pillar modify file_roots.
 2018-10-10 13:10:50 -05:00
rallytime
32e7d90384
Add 2018.3.4 release notes file 2018-10-10 10:14:29 -04:00
rallytime
6c00003fd8
Add 2017.7.9 release notes file 2018-10-10 10:12:26 -04:00
rallytime
216fd64013
Remove event_publisher_pub_hwm and salt_event_pub_hwm from documentation 
Fixes #49925

The `event_publisher_pub_hwm` and `salt_event_pub_hwm` configuration options
were removed in #38723. (They are obsolete and not used within salt any longer.)

When those options were removed, I neglected to remove them from the docs. This
PR cleans up the references in the docs.
 2018-10-08 10:51:01 -04:00
rallytime
46c0e50638
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/man/salt.7
 2018-10-03 09:45:20 -04:00
rallytime
a65c60d862
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/state.py
  - salt/utils/hashutils.py
  - tests/integration/modules/test_state.py
 2018-10-02 15:09:51 -04:00
Erik Johnson
108c026e1d
Fix additional references to Fluorine in matcher docs 2018-10-02 11:53:13 -05:00
C. R. Oldham
853740d00b
Change versionadded to Neon 2018-10-02 11:49:40 -05:00
Paulo-Nunes
fb6f81835a Edit requisite documentation 
Fixes #49836
 2018-10-01 21:08:49 -04:00
Nicole Thomas
ec978061aa
Merge pull request #49764 from garethgreenaway/49520_multimaster_dns_issue_fix 
[2018.3] Adding retry_dns_count to minion
 2018-10-01 10:20:02 -04:00
rallytime
81b0aa7099
Add "in progress" notation back to the 2018.3.3 release notes 
This has been removed in the 2018.3.3 branch for release prep, but the docs
on the main website still need to say this is in progress until we release.
 2018-10-01 09:17:50 -04:00
rallytime
0e761036f1
Merge branch '2018.3.3' into '2018.3' 
No conflicts.
 2018-09-30 12:39:44 -04:00
Gareth J. Greenaway
741928bfee
Fixes per request from @rallytime. 2018-09-27 08:44:06 -07:00
Gareth J. Greenaway
e66dc18805
Updating the resolve_dns function in minion.py to include a new minion configuration option which will control how many attempts will be made when the master hostname is unable to be resolved before giving up. 2018-09-27 08:44:06 -07:00
Nicole Thomas
1db2d2e4d0
Merge pull request #48809 from cro/matcher_in_loader2 
Matcher in loader, take 4
 2018-09-26 09:22:39 -04:00
rallytime
7e0db5cb15
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
 2018-09-25 15:18:00 -04:00
Megan Wilhite
0b254373b1
Merge pull request #49743 from Ch3LL/8.3_in_progress 
Remove In Progress note for 2018.3.3 release
 2018-09-21 16:33:17 -04:00
Megan Wilhite
f2810b8736
Merge pull request #49742 from Ch3LL/man_8.3 
Update man pages for 2018.3.3
 2018-09-21 16:32:54 -04:00
Ch3LL
3043b0890f
Remove In Progress note for 2018.3.3 release 2018-09-21 16:28:49 -04:00
Ch3LL
a418ef87b1
Update man pages for 2018.3.3 2018-09-21 16:18:36 -04:00
Ch3LL
aef85d3b3f
Add Changelog for 2018.3.3 2018-09-21 14:22:04 -04:00
C. R. Oldham
85ac68b62c
Clarify doc 2018-09-21 09:36:02 -06:00
C. R. Oldham
2495d48f49
Add docs for loadable matchers. 2018-09-21 09:35:52 -06:00
Erik Johnson
8393560642
Add warning about using jinja filters to dump dicts in Jinja 2018-09-20 14:56:26 -05:00
rallytime
9298304ce9
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-09-19 14:07:06 -04:00
rallytime
b39dacf06c
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/pillar/cmd_yamlex.py
 2018-09-18 10:08:16 -04:00
Erik Johnson
7e5bab78c5
Fix docs build errors (2017.7 branch) 2018-09-17 22:35:08 -06:00
rallytime
c274635933
Fix some doc build warnings 2018-09-17 16:20:05 -04:00
rallytime
49afc328b5
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - .github/CODEOWNERS
 2018-09-07 16:21:13 -04:00
rallytime
cf508a4a50
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/opt.txt
  - requirements/tests.txt
  - salt/modules/win_service.py
  - tests/integration/states/test_service.py
 2018-09-06 12:08:01 -04:00
rallytime
862c44c036
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-09-05 09:41:04 -04:00
rallytime
de7ef3d681
Add "in progess" notation back to 2017.7.8 release notes 
We need this notation in the branch for now. We will remove it once the release
is live.
 2018-09-05 09:39:14 -04:00
rallytime
edad2dcda9
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-09-05 09:36:33 -04:00
Ch3LL
d40b6444a1
Update 2017.7.8 ChangeLog with new fixes 2018-09-04 17:28:50 -04:00
rallytime
0c8b412556
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/integration/modules/test_archive.py
 2018-09-04 12:05:48 -04:00
rallytime
2317b5ef58
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - tests/integration/modules/test_win_ntp.py
 2018-09-04 12:01:38 -04:00
rallytime
d1e51db8d3
Remove references to unused milestones in docs 2018-08-30 15:12:34 -04:00
rallytime
f7226f400f
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/osx/build_env.sh
  - salt/modules/win_useradd.py
  - salt/utils/yamldumper.py
  - tests/integration/modules/test_archive.py
  - tests/integration/output/test_output.py
 2018-08-30 14:23:23 -04:00
Erik Johnson
7372e9d6e3
Add minion documentation for enable_gpu_grains 2018-08-28 11:40:14 -05:00
Erik Johnson
ea1b53cb6f
Fix incorrect master docs for enable_gpu_grains 2018-08-28 11:39:53 -05:00
Erik Johnson
d1b7fb449c
Revert "Update documentation to correctly state enable_gpu_grains default" 
This reverts commit 2fe675cfdd.
 2018-08-28 11:17:32 -05:00
rallytime
da3a29c680
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-08-28 12:06:32 -04:00
Erik Johnson
d69e3e1a27
Add separate deserializer_opts argument to file.serialize 
The functions to load and dump data don't have the same arguments, so
it's not a good idea to pass the same kwargs to both and then capture
the inevitable traceback that will be the result. Instead, this adds a
separate `deserializer_opts` argument which will be used only in the
case where `merge_if_exists` is set to `True`.
 2018-08-24 18:12:05 -05:00
rallytime
c3ecefc785
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/file.py
  - salt/modules/win_service.py
  - salt/states/mount.py
  - salt/states/service.py
  - tests/integration/__init__.py
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
 2018-08-23 11:50:41 -04:00
Mike Place
f8c55b85e1
Merge pull request #49184 from ralish/external_nodes_docs 
Remove obsolete documentation on external_nodes setting
 2018-08-18 08:50:10 -04:00
Samuel D. Leslie
2fe675cfdd
Update documentation to correctly state enable_gpu_grains default 
While the relevant code in grains/core.py does enable GPU grains by
default, the default in config/__init__.py for the DEFAULT_MASTER_OPTS
dictionary is disabled. This takes precedence over the default in
grains/core.py which would only take effect if the enable_gpu_grains
setting was not specified at all.
 2018-08-18 13:47:53 +10:00
Samuel D. Leslie
2e29b292bf
Remove obsolete documentation on external_nodes setting 
This setting is no longer used anywhere in the codebase having been
superseded by the master_tops setting many releases ago.
 2018-08-18 13:11:02 +10:00
Daniel Wallace
02823e5768
Merge pull request #48873 from dmacvicar/terraform_roster_3 
Terraform roster module to be used with terraform-provider-salt
 2018-08-17 19:38:40 -05:00
Ch3LL
f6b70bb653
Add changelog to 2017.7.8 release notes 2018-08-14 10:11:45 -04:00
rallytime
6e6091c3ba
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/integration/runners/test_cache.py
  - tests/support/case.py
 2018-08-14 09:57:37 -04:00
Nicole Thomas
6942ef1102
Merge pull request #49096 from rallytime/new-doc-img-2018.3 
Update the DOCBANNER image for saltconf
 2018-08-13 15:59:38 -04:00
rallytime
75080705ce
Update the DOCBANNER image for saltconf 2018-08-13 15:56:44 -04:00
rallytime
90954203cb
Update the DOCBANNER image for saltconf 2018-08-13 15:10:56 -04:00
Nicole Thomas
98a8da728b
Revert "New logo 2017.7 (WIP)" 2018-08-10 17:22:03 -04:00
Mike Place
bbcd1869ec
Merge pull request #48982 from newwebash/new_logo_2017.7 
New logo 2017.7 (WIP)
 2018-08-10 22:21:28 +02:00
rallytime
5ff1ddb0dd
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/utils/schedule.py
  - tests/integration/files/conf/master
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
  - tests/integration/scheduler/test_eval.py
 2018-08-10 14:18:34 -04:00
rallytime
201031fa8a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - 	doc/man/salt.7
  - 	doc/ref/configuration/minion.rst
  - 	salt/cloud/clouds/ec2.py
  - 	salt/returners/highstate_return.py
  - 	tests/support/gitfs.py
  - 	tests/unit/loader/test_loader.py
 2018-08-10 13:12:14 -04:00
Chris Speidel
f7ac085eb5
minor doc fix in netyang.py 2018-08-09 14:45:40 -04:00
Nicole Thomas
d7b7a92ef6
Merge pull request #49011 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-09 13:34:17 -04:00
Mircea Ulinic
29b84bb047 More small corrections 2018-08-08 21:43:11 +01:00
rallytime
3e6445a9d6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/beacons/log.py
  - salt/client/ssh/__init__.py
  - salt/modules/cmdmod.py
  - salt/utils/win_functions.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
 2018-08-08 13:31:57 -04:00
Erik Johnson
0728b5f8b6
Add note about Python 3.5+ only support for optimization_order 2018-08-08 11:22:52 -05:00
Erik Johnson
0f60beb6b6
Fix bad copypasta 2018-08-08 11:22:52 -05:00
Erik Johnson
fbcd142ea2
Add configuration docs for optimization_order config option 2018-08-08 11:22:52 -05:00
Mircea Ulinic
a7410c9db1 Small corrections 2018-08-08 16:22:09 +01:00
Mircea Ulinic
0aebde0df3 Add NetBox and PeeringDB, as well as list all the new modules 2018-08-08 16:07:47 +01:00
Mircea Ulinic
69466182b5 Document the new network automation features 2018-08-08 15:35:05 +01:00
Ashley Newton
5c1c311f77 Update Salt Conf ad 2018-08-07 13:49:26 -06:00
Ch3LL
757daf7d7e
add runas macosx warning in 2018.3.3 release notes 2018-08-07 15:49:26 -04:00
rallytime
26ef48814e
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/modules/virt.py
  - tests/integration/shell/test_matcher.py
 2018-08-07 11:00:42 -04:00
rallytime
64fe3be41a
Update man pages for 2017.7.8 release 2018-08-07 09:35:01 -04:00
Nicole Thomas
d97178c12a
Merge pull request #48919 from loverend/add_google_chat 
Add new google_chat module
 2018-08-06 15:49:32 -04:00
Luke Overend
969d7d68fc
Add new google_chat module 
To send a message directly to google chat via the api (not via a bot)
you need to configure a webhook and post directly to that webhook url.
 2018-08-06 13:37:18 +01:00
Mircea Ulinic
dfe18bf48b Add SCP module autodoc 2018-08-05 22:12:57 +01:00
Nicole Thomas
084e7f0ef4
Merge branch '2018.3' into jid 2018-08-05 15:16:41 -04:00
Nicole Thomas
a9daa92d73
Merge pull request #47621 from dwoz/win_runas 
Runas any user even when shell is limited like winrm
 2018-08-05 14:29:50 -04:00
Nicole Thomas
d51cbc689c
Merge pull request #48879 from mirceaulinic/napalm-formula 
Adding an execution module providing helpers for the NAPALM formulas
 2018-08-05 14:25:10 -04:00
Nicole Thomas
e73131a7a7
Merge pull request #48917 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-08-05 10:36:57 -04:00
Daniel A. Wozniak
09c12532a3
Fix doc change conflicts 2018-08-03 12:41:40 -07:00
Daniel A. Wozniak
b6fce06d66
Update release notes with runas changes 2018-08-03 12:32:33 -07:00
Daniel A. Wozniak
25e7b041f1
Document runas password changes 2018-08-03 12:32:33 -07:00
rallytime
8ca89df7e8
Update backticks on job_cache docs 
There's an extra backtick after the `job_cache` link, and not enough
backticks around `keep_jobs` parameter.
 2018-08-03 12:03:37 -04:00
Nicole Thomas
b656c5884a
Merge branch 'develop' into return-codes 2018-08-03 11:49:29 -04:00
Nicole Thomas
8c5b369be0
Merge pull request #48660 from garethgreenaway/jids_in_logs 
[develop] Adding jids in master & minion logs
 2018-08-03 11:22:56 -04:00
rallytime
a8b30fed9f
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/nilrt_ip.py
  - salt/states/pip_state.py
  - tests/unit/modules/test_file.py
 2018-08-03 09:27:20 -04:00
Mircea Ulinic
7722544f92 Add netbox Pillar to autodoc 2018-08-03 10:38:53 +01:00
Gareth J. Greenaway
f8f6ff89ff
Merge branch 'develop' into jids_in_logs 2018-08-02 18:03:45 -07:00
Duncan Mac-Vicar P
f4e239290d Terraform roster module to be used with terraform-provider-salt 2018-08-03 00:06:09 +02:00
Nicole Thomas
d7110e89ab
Merge pull request #48872 from mglaske/patch-1 
Update writing.rst
 2018-08-02 15:22:00 -04:00
Nicole Thomas
7fe663af33
Merge pull request #48864 from rallytime/pkg-deprecation 
Remove support for virtual packages in the pkg state
 2018-08-02 14:06:12 -04:00
Nicole Thomas
3dc6083a99
Merge branch 'develop' into return-codes 2018-08-02 13:28:39 -04:00
Erik Johnson
7dce7cde14
Explictly document the configuration override priority 2018-08-02 11:19:22 -05:00
Nicole Thomas
93c5955d8f
Merge pull request #48859 from mirceaulinic/cisco-ios-cfg 
Add module for Cisco IOS configuration manipulation
 2018-08-02 07:28:14 -04:00
Mircea Ulinic
ddf8126958 Add napalm_formula autodoc 2018-08-02 10:29:27 +00:00
Michael Glaske
6545ec7bcc
Update writing.rst 
We identified this issue, which was very difficult to track down.  Don't think it's really a bug, and likely state names should never contain a hyphen anyways.  But basically it renders the name as (first - second) = function(). (first-second.py), and you get a "can't assign to operator" exception.
 2018-08-01 18:13:21 -04:00
Nicole Thomas
60bbdee877
Merge pull request #48344 from gtmanfred/proxycaller 
allow using proxy minion from cli
 2018-08-01 14:39:44 -04:00
Nicole Thomas
c8df9e8b5a
Merge pull request #48854 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-08-01 12:39:31 -04:00
rallytime
3f1c6a59a5
Remove support for virtual packages in the pkg state 
Refs #47375 and #47396
 2018-08-01 12:32:21 -04:00
Nicole Thomas
4b533d341e
Merge pull request #48823 from rallytime/fluorine-deprecations-nochown 
Remove deprecation warnings for "no_chown" option
 2018-08-01 12:23:56 -04:00
Nicole Thomas
48bcef9b58
Merge pull request #48688 from mirceaulinic/peeringdb-mod 
A new execution module: PeeringDB
 2018-08-01 10:10:48 -04:00
Nicole Thomas
0faa92edbb
Merge branch 'develop' into return-codes 2018-08-01 09:33:42 -04:00
Mircea Ulinic
2d78646612 Autodoc for the iosconfig module 2018-08-01 13:06:00 +00:00
Gareth J. Greenaway
121d68b2a5
Merge branch 'develop' into jids_in_logs 2018-07-31 16:09:56 -07:00
Erik Johnson
395591d3c9
Add return codes docs to TOC 2018-07-31 17:23:20 -05:00
Erik Johnson
4382995951
Add return code documentation 2018-07-31 17:22:21 -05:00
rallytime
4bcdf16e21
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/mac_brew.py
  - salt/utils/minions.py
  - tests/integration/states/test_file.py
 2018-07-31 16:56:07 -04:00
Nicole Thomas
ed3d85be98
Merge branch 'develop' into proxycaller 2018-07-31 16:30:22 -04:00
Nicole Thomas
232db0a967
Merge pull request #48733 from mirceaulinic/ciscoconfparse-mod 
Add ciscoconfparse execution module for various text config mainipulations
 2018-07-31 15:13:28 -04:00
Gareth J. Greenaway
16172dc0bc
Documentation fix. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
cc14dff8a8
Adding information about log_fmt_jid to logging documentation 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
3b8a4eed17
Adding some notes to the Fluorine release notes. Adding the default format for log_fmt_jid. 2018-07-31 09:19:06 -07:00
Nicole Thomas
1488a89983
Merge branch 'develop' into ciscoconfparse-mod 2018-07-31 11:40:00 -04:00
rallytime
4a51ed6ccf
Remove deprecation warnings for "no_chown" option 
The `no_chown` option in various functions was marked for removal in
Fluorine. This PR removes those warnings and updates the releaes notes
accordingly.

This PR also updates some of the Fluorine references in the zfs module
as the documentation can be more specific.
 2018-07-30 13:24:38 -04:00