valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
99,019 Commits 24 Branches 182 Tags 341 MiB
4fcc9277dd
Commit Graph

8927 Commits

Author SHA1 Message Date
Erik Johnson
267544fd3e
Tweak release notes to reflect new jinja filter being backported 2018-06-27 12:26:35 -05:00
Erik Johnson
e34e39f0e2
Document filter deprecation 2018-06-27 12:23:29 -05:00
Erik Johnson
baf49d709d
Add release notes about json_encode_dict/json_encode_list deprecations 2018-06-27 10:29:31 -05:00
Erik Johnson
e2ea136757
Document filter deprecation 2018-06-27 10:29:31 -05:00
Erik Johnson
458b45b9e6
Minor clarification 2018-06-27 10:29:31 -05:00
Erik Johnson
7f473e6fde
Fix RST link syntax 2018-06-27 10:29:31 -05:00
Erik Johnson
b34f56b27b
Document change to YAML loader behavior in Fluorine release notes 2018-06-27 10:29:30 -05:00
Megan Wilhite
5b8d55428e
Merge pull request #48323 from Ch3LL/update_version_doc_2018.3 
Update release versions for the 2018.3 branch
 2018-06-27 09:44:58 -04:00
Megan Wilhite
53b4c4dc00
Merge pull request #48325 from Ch3LL/update_version_doc_develop 
Update release versions for the develop branch
 2018-06-27 09:44:06 -04:00
Megan Wilhite
3b32fa0e51
Merge pull request #48327 from Ch3LL/rn_remove_develop 
Remove In Progress Warning for 2018.3.2 Release
 2018-06-27 09:43:01 -04:00
Nicole Thomas
7b4972accb
Merge pull request #48239 from mirceaulinic/redis-sdb-mod 
Redis sdb mod
 2018-06-26 17:43:56 -04:00
Nicole Thomas
b4f81b853c
Merge pull request #48305 from thetoolsmith/feature_tag_ec2_spot_request 
add support for tagging ec2 instance spot requests
 2018-06-26 17:39:25 -04:00
Ch3LL
962cb143bc
Remove In Progress Warning for 2018.3.2 Release 2018-06-26 17:09:30 -04:00
Ch3LL
dfce1ad5ed
Remove In Progress Warning for 2018.3.2 Release 2018-06-26 17:04:11 -04:00
Ch3LL
b4dc1f8c71
Update release versions for the develop branch 2018-06-26 15:51:59 -04:00
Ch3LL
b4548aca56
Update release versions for the 2018.3 branch 2018-06-26 15:51:53 -04:00
Ch3LL
47845ba810
Update release versions for the 2017.7 branch 2018-06-26 15:51:46 -04:00
Erik Johnson
baf1653221
Fix module name in title 2018-06-26 14:00:23 -05:00
Erik Johnson
17f7b18da1
Sort and update mocks in doc configuration 2018-06-26 14:00:02 -05:00
Paul Bruno
aeb4e7ffe0 remove whitespace 2018-06-26 11:33:50 -04:00
Paul Bruno
4132e4e45e Merge branch 'feature_tag_ec2_spot_request' of https://github.com/thetoolsmith/salt into feature_tag_ec2_spot_request 2018-06-26 11:31:01 -04:00
Paul Bruno
916c59dddb update documentation for aws ec2 spot instance rerequest tagging support 2018-06-26 11:29:48 -04:00
Nicole Thomas
6d5e6e7eb5
Merge pull request #48261 from cbosdo/virt-init 
Virt init improvements
 2018-06-26 09:41:38 -04:00
Nicole Thomas
906c7e80be
Merge pull request #48220 from mnieber/patch-1 
Explain how to use a grain in a state
 2018-06-25 16:29:17 -04:00
Erik Johnson
6c33345f05
Fix typos in new mock_open docs 2018-06-25 14:05:54 -05:00
rallytime
6177d6e3c1
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/client/__init__.py
  - salt/grains/core.py
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_file.py
  - tests/unit/roster/test_sshconfig.py
 2018-06-25 11:26:25 -04:00
Cédric Bosdonnat
614a213b3a
Fix virt images default location in docs 
virt images are not stored in /srv/salt/salt-images, but in
/srv/salt-images. Fix the documentation to reflect the truth.
 2018-06-25 16:53:24 +02:00
rallytime
c7bb8a50b0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/x509.py
  - salt/runners/cloud.py
  - tests/unit/modules/test_state.py
 2018-06-25 10:41:06 -04:00
Nicole Thomas
210d558615
Merge pull request #48260 from mirceaulinic/netmiko-proxy 
Adding the initial version of the Netmiko Proxy and Execution modules
 2018-06-25 10:02:28 -04:00
Nicole Thomas
27a0e95174
Merge pull request #48279 from terminalmage/mock_open-docs 
Add documentation/further enhancements to rewritten mock_open
 2018-06-25 09:12:29 -04:00
Erik Johnson
65c575ae9c
Fix spelling error 2018-06-24 13:27:09 -05:00
Erik Johnson
09aae0c82b
Add more examples and information on strict string types 2018-06-23 21:27:01 -05:00
Erik Johnson
8c069d105d
Add some mock_open docs 2018-06-23 15:05:18 -05:00
Nicole Thomas
2661ae5764
Merge pull request #48262 from cbosdo/virt-cleanup 
Virt cleanup
 2018-06-22 13:56:53 -04:00
Nicole Thomas
7365b81389
Merge pull request #48267 from mirceaulinic/template-mod 
Adding a little module as a helper for template rendering on the fly
 2018-06-22 11:47:11 -04:00
Nicole Thomas
67cb5563ef
Merge pull request #48252 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-22 11:13:41 -04:00
Mircea Ulinic
e369357ff3 Adding the template module for autodoc 2018-06-22 11:23:13 +00:00
Mircea Ulinic
d163f64509 Adding the netmiko execution module to autodoc 2018-06-22 10:10:46 +00:00
Mircea Ulinic
917af844a6 Add netmiko proxy module to autodoc 2018-06-22 10:10:46 +00:00
Cédric Bosdonnat
b1c685d7f1
doc: mock boto.regioninfo._load_json_file 
Mockup _load_json_file() in order to avoid the following errors when
building the docs:

WARNING: autodoc: failed to import module 'salt.modules.boto_asg'; the following exception was raised:
Traceback (most recent call last):
  File "/public/src/salt/env/lib/python3.6/site-packages/sphinx/ext/autodoc/importer.py", line 140, in import_module
    __import__(modname)
  File "/public/src/salt/salt/modules/boto_asg.py", line 63, in <module>
    import boto.ec2
  File "/public/src/salt/env/lib/python3.6/site-packages/boto/ec2/__init__.py", line 31, in <module>
    RegionData = load_regions().get('ec2', {})
  File "/public/src/salt/env/lib/python3.6/site-packages/boto/regioninfo.py", line 100, in load_regions
    endpoints = _load_builtin_endpoints()
  File "/public/src/salt/env/lib/python3.6/site-packages/boto/regioninfo.py", line 128, in _load_builtin_endpoints
    resolver = BotoEndpointResolver(endpoints)
  File "/public/src/salt/env/lib/python3.6/site-packages/boto/endpoints.py", line 150, in __init__
    endpoint_data, service_rename_map)
  File "/public/src/salt/env/lib/python3.6/site-packages/boto/endpoints.py", line 44, in __init__
    super(_CompatEndpointResolver, self).__init__(endpoint_data)
  File "/public/src/salt/env/lib/python3.6/site-packages/boto/vendored/regions/regions.py", line 95, in __init__
    raise ValueError('Missing "partitions" in endpoint data')
ValueError: Missing "partitions" in endpoint data
 2018-06-22 10:51:48 +02:00
Cédric Bosdonnat
8199700fdb
Fix sphynx error about tornado.version_info 
This is fix errors like the following when building docs:

WARNING: autodoc: failed to import module 'salt.states.saltmod'; the following exception was raised:
Traceback (most recent call last):
  File "/public/src/salt/env/lib/python3.6/site-packages/sphinx/ext/autodoc/importer.py", line 140, in import_module
    __import__(modname)
  File "/public/src/salt/salt/states/saltmod.py", line 36, in <module>
    import salt.output
  File "/public/src/salt/salt/output/__init__.py", line 19, in <module>
    import salt.loader
  File "/public/src/salt/salt/loader.py", line 23, in <module>
    import salt.config
  File "/public/src/salt/salt/config/__init__.py", line 27, in <module>
    import salt.utils.network
  File "/public/src/salt/salt/utils/network.py", line 35, in <module>
    import salt.utils.zeromq
  File "/public/src/salt/salt/utils/zeromq.py", line 39, in <module>
    if tornado.version_info < (5,):
TypeError: '<' not supported between instances of 'Mock' and 'tuple'
 2018-06-22 10:51:48 +02:00
Nicole Thomas
731ec0a11a
Merge pull request #48037 from terminalmage/fix-custom-types-sync-docs 
Add "sync_mods" argument to state.apply/state.sls
 2018-06-21 15:57:02 -04:00
Nicole Thomas
0bae927048
Merge pull request #48249 from rallytime/2017.7.7-release-notes-update 
Update release notes for 2017.7.7
 2018-06-21 14:30:38 -04:00
Nicole Thomas
8e06471817
Merge pull request #48242 from asnell/asnell-patch-1 
Add sample list data via command line pillar
 2018-06-21 14:27:40 -04:00
rallytime
84ec655c24
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/minion.py
  - salt/modules/dockermod.py
  - salt/modules/lxc.py
  - salt/utils/__init__.py
  - tests/unit/modules/test_mount.py
 2018-06-21 14:22:15 -04:00
rallytime
19c104b6cd
Update release notes for 2018.3.2 2018-06-21 13:03:39 -04:00
rallytime
36032c8ee7
Update release notes for 2017.7.7 2018-06-21 13:02:25 -04:00
asnell
f66bf60073
Add sample list data via command line pillar 2018-06-21 08:44:14 -04:00
Mircea Ulinic
63ddcd72a6 Document the Redis SDB module 2018-06-21 10:54:17 +00:00
Max Arnold
00798a9e33 Fix quite common Exception typos 2018-06-21 14:22:44 +07:00
Nicole Thomas
7abc85f46b
Merge pull request #48225 from myii/patch-1 
Fix typos in Jinja `load_yaml` example
 2018-06-20 12:53:14 -04:00
Nicole Thomas
65dc44308e
Merge pull request #48178 from dwfreed/fixup-presence 
Teach salt.utils.minions.CkMinions.connected_ids() about IPv6
 2018-06-20 12:33:37 -04:00
Imran Iqbal
9fd9a09b4a
Fix typos in Jinja load_yaml example 2018-06-20 16:32:20 +01:00
Nicole Thomas
1f88df6e89
Merge pull request #48210 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.1 to 2018.3
 2018-06-20 09:43:18 -04:00
Nicole Thomas
3a378a9036
Merge pull request #48162 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-06-20 09:42:49 -04:00
Maarten Nieber
683bec42a7
Explain how to use a grain in a state 2018-06-20 08:08:40 +02:00
Daniel Wallace
5b4897f050
Merge pull request #48186 from rallytime/saltcheck-docs 
Add autodoc module for saltcheck.py
 2018-06-19 14:03:54 -05:00
rallytime
dae65da256
Merge branch '2018.3.1' into '2018.3' 2018-06-19 14:56:06 -04:00
Nicole Thomas
1343b0e5f9
Merge pull request #48159 from emattiza/patch-1 
Remove Azure <1.0 Old Dependency Change Note
 2018-06-19 14:22:10 -04:00
Doug Freed
c3650eed03
Update presence_events docs to remove localhost comment 
Localhost minions are now included in presence events.
 2018-06-19 13:55:09 -04:00
rallytime
da7603d879
Add autodoc module for saltcheck.py 2018-06-18 09:50:19 -04:00
Ky-Anh Huynh
860a8b9924
doc/dev/formulas: fix minor Jinja syntax errors 2018-06-18 10:42:44 +07:00
Erik Johnson
c5802ad465
Fix the version number in versionadded 
2017.7.7 has already been released
 2018-06-17 21:47:33 -05:00
Erik Johnson
44c275698a
Actually it's more than just add/remove that updates the mine 2018-06-17 21:16:09 -05:00
Erik Johnson
0cb6996b07
Add release notes mention of docker.update_mine config option 2018-06-17 21:11:05 -05:00
Erik Johnson
de05097b20
Add docs for new config option 2018-06-17 21:10:50 -05:00
rallytime
a0ad794132
Update release notes for 2017.7.7 2018-06-17 15:29:06 -04:00
rallytime
dc2d40d1c2
Update release notes for 2018.3.2 2018-06-17 15:24:25 -04:00
rallytime
f23207002d
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/unit/beacons/test_btmp_beacon.py
  - tests/unit/beacons/test_wtmp_beacon.py
  - tests/unit/grains/test_core.py
 2018-06-15 17:00:59 -04:00
rallytime
398cc78224
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - doc/topics/releases/2017.7.6.rst
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_timezone.py
 2018-06-15 16:51:45 -04:00
Evan Mattiza
49c5651280
Remove Azure <1.0 Old Dependency Change Note 
I understand there was a period where pyazure 1.0 was not working with salt per #27980 and seeing as this was resolved with newer versions, the note is no longer relevant.
 2018-06-15 15:05:05 -05:00
Nicole Thomas
7e62c0444e
Merge pull request #48048 from icyfork/aws_provider_with_role_arn_support 
cloud/aws: allow users to provide role_arn in configuration
 2018-06-15 13:11:42 -04:00
Nicole Thomas
e1e566d1f8
Merge pull request #48135 from rallytime/release-notes-2017.7 
Update the 2017.7.7 and 2017.7.8 release notes
 2018-06-14 17:22:06 -04:00
Erik Johnson
7f53d5a68e
Improve module environment docs 2018-06-14 13:46:32 -05:00
Bo Maryniuk
d1abcf2322
Update the documentation 2018-06-14 13:45:23 -05:00
Bo Maryniuk
ef96da833b
Add documentation for the configurable module environment 2018-06-14 13:45:23 -05:00
rallytime
8893bf0d4c Update man pages for 2017.7.7 2018-06-14 17:43:13 +00:00
rallytime
8c340134f5 Update man pages for 2018.3.2 2018-06-14 17:26:13 +00:00
rallytime
217005b8f1
Add missing v for tag reference 2018-06-14 12:12:42 -04:00
rallytime
7a97f157b3
Add missing v for tag reference 2018-06-14 12:10:18 -04:00
rallytime
2f2b69ed37
Add "in progress" notation to 2017.7.7 release notes 2018-06-14 12:08:47 -04:00
rallytime
06a1151a63
Add release notes file for 2017.7.7 2018-06-14 12:06:04 -04:00
rallytime
885b2862ce
Move 2017.7.7 release notes to 2017.7.8 2018-06-14 12:05:37 -04:00
rallytime
d53569d1e3
Add release notes file for 2017.7.7 2018-06-14 11:48:07 -04:00
rallytime
afe1e91972
Add "in progress" notation to 2018.3.2 release notes 2018-06-14 10:55:44 -04:00
rallytime
3e4272ac09
Add release notes for 2018.3.2 2018-06-14 10:53:40 -04:00
rallytime
88c584cb0d
Move 2018.3.2 release notes to 2018.3.3 2018-06-14 10:53:07 -04:00
rallytime
0b13be0111
Add release notes for 2018.3.2 2018-06-14 10:19:47 -04:00
rallytime
0fcf4c54d1
Add no_proxy option to cont/minion docs and Fluorine release notes 
Also cleans up a couple of items based on the feedback in #43764
 2018-06-13 15:49:00 -04:00
Brendan Beveridge
5f7aae3eef
adjust doco 2018-06-13 15:41:10 -04:00
Brendan Beveridge
6135c19a49
doc typo 2018-06-13 15:41:09 -04:00
Brendan Beveridge
cc85427724
add support for no_proxy for apt pkg and generic http util 2018-06-13 15:41:09 -04:00
rallytime
cdb45874de
Merge branch '2017.7.6' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.6.rst
  - requirements/base.txt
 2018-06-13 15:04:55 -04:00
Mike Place
211f90df7c
Merge pull request #48028 from bbrandt/patch-1 
recommend --force-with-lease when rebasing
 2018-06-13 16:56:52 +02:00
Mike Place
c8d401843f
Merge pull request #48079 from neilvana/patch-1 
Fix broken links to setuptools documentation.
 2018-06-13 16:15:37 +02:00
rallytime
843171f5e3
Remove "in progress" info for 2018.3.1 release notes 2018-06-13 09:55:33 -04:00
rallytime
f3c9381d16
Remove "in progress" info for 2017.7.6 release notes 2018-06-13 09:55:25 -04:00
rallytime
fad6a0991e
Remove "in progress" info for 2018.3.1 release notes 2018-06-13 09:53:08 -04:00
rallytime
a3b3b0a0e1
Remove "in progress" info for 2017.7.6 release notes 2018-06-13 09:52:12 -04:00
rallytime
1b8d1c936b
Remove "in progress" info for 2017.7.6 release notes 2018-06-13 09:49:47 -04:00
Daniel Wallace
611ea92b8b
Merge branch 'develop' into aws_provider_with_role_arn_support 2018-06-13 08:47:55 -05:00
rallytime
444f1cb9b8
Update release versions for the develop branch 2018-06-13 09:47:21 -04:00
rallytime
f9be1b9125
Update release versions for the 2018.3 branch 2018-06-13 09:47:16 -04:00
rallytime
9a0f4d190a
Update release versions for the 2017.7 branch 2018-06-13 09:47:12 -04:00
Neil Stoddard
666c517a25
Fix broken links to setuptools documentation. 2018-06-12 21:43:41 -05:00
Erik Johnson
24545204b3
Fix inaccurate gitfs_saltenv example in GitFS Walkthrough 2018-06-12 09:25:53 -05:00
Ben Brandt
bf6529d071
recommend --force-with-lease when rebasing 
Using `--force-with-lease` allows one to force push without the risk of
unintentionally overwriting someone else's work.

The git-push(1) man page states:

Usually, "git push" refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it.

This option overrides this restriction if the current value of the remote ref is the expected value. "git push" fails otherwise.

Imagine that you have to rebase what you have already published. You will have to bypass the "must fast-forward" rule in order to replace the history you originally published with the rebased history. If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with --force will lose her work.

This option allows you to say that you expect the history you are updating is what you rebased and want to replace. If the remote ref still points at the commit you specified, you can be sure that no other people did anything to the ref. It is like taking a "lease" on the ref without explicitly locking it, and the remote ref is updated only if the "lease" is still valid.

References:
- https://developer.atlassian.com/blog/2015/04/force-with-lease/
- https://github.com/thoughtbot/guides/pull/363
 2018-06-11 22:53:11 -05:00
Nicole Thomas
037d198692
Merge pull request #48001 from rares-pop/dev/iepopr/add_salt-api_windows 
Add salt-api on Windows platform
 2018-06-11 17:17:58 -04:00
Erik Johnson
20f71ff6f6
Fix link without target in 2018.3.0 release notes 2018-06-11 12:01:34 -05:00
Ky-Anh Huynh
a9663588bf
cloud/aws: add notes for role_arn setting in provider configuration 2018-06-11 22:12:04 +07:00
Rares POP
3e0547b135 Add fluorine release notes for salt-api 
Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-11 18:04:58 +03:00
Rares POP
895d8cee5c Merge branch 'develop' into dev/iepopr/add_salt-api_windows 
Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-11 11:57:09 +03:00
Rares POP
c640b5cd42 Add salt-api on Windows platform 
salt-api is broken on Windows platform
due to pickling issues on the salt.loader.netapi
Workaround that by creating a runner class
that can be pickled.

Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-11 11:38:08 +03:00
nicholasmhughes
4845e02b30
fixes #48019 add ability to pass image resource ID for vm creation 2018-06-10 22:41:32 -04:00
Erik Johnson
e4d67c5fd8
Update docs to include references to new "sync" argument 2018-06-08 12:29:19 -05:00
Erik Johnson
8289b07e24
Fix documentation on when custom types are synced 2018-06-08 09:33:35 -05:00
Nicole Thomas
c1c8b36639
RST Syntax Fix: code-blocks need a blank line 2018-06-08 09:38:58 -04:00
plastikos
1be25616a7
Add Jinja include relative paths to Fluorine release notes 2018-06-08 02:02:07 -06:00
Erik Johnson
04a80673a2
Clean up Sphinx build errors in develop branch 2018-06-06 20:19:44 -05:00
Ch3LL
01e8c59296
remove duplicate changelog line 2018-06-06 14:08:35 -04:00
Ch3LL
5b8534cfb3
Update 2018.3.1 release notes with new fixes 2018-06-06 14:07:11 -04:00
rallytime
7dc1e770c4
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/topics/installation/freebsd.rst
  - salt/cloud/clouds/oneandone.py
  - salt/grains/core.py
  - salt/modules/napalm_ntp.py
  - salt/modules/win_update.py
  - salt/modules/win_wua.py
  - salt/modules/zabbix.py
  - salt/renderers/pass.py
  - salt/states/vault.py
  - tests/unit/states/test_win_update.py
 2018-06-06 13:35:36 -04:00
Erik Johnson
f89d2ccd30
Clean up Sphinx warnings 2018-06-06 08:42:21 -05:00
Daniel Wallace
b12f80712b
add more documentation for new function 2018-06-04 14:01:33 -05:00
Daniel Wallace
272cb58899
add to release notes 2018-06-04 14:01:32 -05:00
Nicole Thomas
b004a1ace7
Merge pull request #47929 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-06-04 10:37:30 -04:00
Nicole Thomas
9160ccde57
Merge pull request #47946 from nicholasmhughes/fix-azurearm-docs-for-volume-options 
Fix Azure docs for volume handling
 2018-06-04 09:49:41 -04:00
Nicole Thomas
250226bcc6
Merge pull request #47238 from pengyao/ssh_private_key_pass 
Fix issue #38366 salt-ssh support private key's passphrase
 2018-06-04 09:28:55 -04:00
nicholasmhughes
10571469bc
fixes #47819 in order to better explain the volumes parameter 2018-06-03 16:57:31 -04:00
rallytime
be8d34ec21
Merge branch '2018.3' into 'develop' 
No conflicts.
 2018-06-01 15:19:09 -04:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
Erik Johnson
af51e16f23
Use more elegant RST syntax 2018-05-31 15:28:25 -05:00
Erik Johnson
d37f7e4f04
Add 2017.7.6 release notes 2018-05-31 15:28:25 -05:00
Erik Johnson
9dddeeefab
Improve documentation on syncing states 2018-05-31 15:28:25 -05:00
Erik Johnson
f465fa3ca7
Add best practices docs for writing states 2018-05-31 15:28:25 -05:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
Erik Johnson
64b9b4d0b8
Clarify that name would override the id declaration 2018-05-31 15:28:24 -05:00
Nicole Thomas
dc5e2b4705
Merge pull request #47391 from twellspring/patch/43914 
event.send add option for return to not show as change
 2018-05-31 14:50:18 -04:00
Nicole Thomas
0d229c6182
Merge branch '2018.3' into fix_47559 2018-05-31 11:28:30 -04:00
pengyao
246a118b93 add salt-ssh support private key's passphrase addition 2018-05-31 10:57:22 +08:00
pengyao
7f413a205f Merge branch 'develop' into ssh_private_key_pass 2018-05-31 10:52:23 +08:00
twangboy
9e612ec9e7
Fix markup in release notes 2018-05-30 16:10:26 -06:00
Nicole Thomas
b4bac9b41b
Merge pull request #47868 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-30 17:20:37 -04:00
Ch3LL
f560a151cd
Remove In Progress for 2018.3.1 Release Notes 2018-05-30 14:14:55 -04:00
rallytime
2801eecb26
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-30 11:14:40 -04:00
Ch3LL
e27ee273a7
Add == line to changelog line for release notes 2018-05-30 10:51:12 -04:00
Ch3LL
61e56d275d
Add changelog to 2018.3.1 release notes 2018-05-30 10:49:30 -04:00
Nicole Thomas
225824f1d8
Merge branch 'develop' into patch/43914 2018-05-30 10:13:28 -04:00
Éric Veiras Galisson
405c90aa76
Updating minion configuration doc 
Correcting default value for log_level_logfile like written in default /etc/salt/minion. See #47893
 2018-05-30 15:52:54 +02:00
Nicole Thomas
f4288a8616
Merge pull request #47869 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-05-30 09:44:15 -04:00
rallytime
58dee4c829
Remove sentence about the release being in progress 2018-05-29 16:27:43 -04:00
rallytime
b3dcb7330e
Remove "in progress" too 2018-05-29 16:26:28 -04:00
rallytime
99e1df7823
Update 2017.7.6 release notes: remove "unreleased" text 
In preparation for the 2017.7.6 release, remove the "unreleased" text
from the release notes.
 2018-05-29 15:31:51 -04:00
Jenni
0738a0f6c2
fix merge conflict 2018-05-29 12:12:11 -07:00
Jenni
f3a3ce582b
move release note to fluorine 2018-05-29 12:05:01 -07:00
Daniel Wallace
13f920415a
add tornado5 note to 2018.3.1 2018-05-29 14:01:54 -05:00
Daniel Wallace
aeacd2b749
allow tornado 5.0 to be installed only for python2 2018-05-29 14:01:18 -05:00
Daniel Wallace
a1c1b5b5cf
allow tornado 5.0 to be installed only for python2 2018-05-29 13:57:54 -05:00
Daniel Wallace
cf1e5d4c25
Merge pull request #47742 from nickgarber/develop__wip-issue-40975-read-salt-cloud-maps-from-the-pillar 
[WIP] feat: read Salt-Cloud Maps from the Pillar
 2018-05-29 12:37:48 -05:00
rallytime
d9096653f7
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/cloud/__init__.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/support/paths.py
 2018-05-29 11:28:06 -04:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/win_snmp.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_pkg.py
  - tests/support/helpers.py
  - tests/support/runtests.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/whitelist.txt
 2018-05-29 11:14:39 -04:00
Daniel Wallace
45da45f636
Merge pull request #47372 from gtmanfred/grains 
Allow for passing in previously compiled grains to custom grain modules
 2018-05-29 10:06:50 -05:00
Daniel Wallace
c4d828c986
Merge pull request #47850 from rallytime/swarm-autodoc 
Fix autodoc for new swarm module
 2018-05-25 20:53:16 -05:00
rallytime
467c8fa45c Fix autodoc for new swarm module 
A misspelling of "members" was causing the docs for the swarm module to
not build.

This change also fixes a bunch of formatting for RST, a handful of other
misspellings, and some small code clean-up.

The docs should be building for the swarm execution module with the
appropriate doc and CLI example formatting.
 2018-05-25 21:07:51 -04:00
Nick Garber
75eb4d13b0
Merge branch 'develop' into develop__wip-issue-40975-read-salt-cloud-maps-from-the-pillar 2018-05-25 11:23:26 -04:00
nicholasmhughes
af16e50856
fixes #47794 where network_resource_group doesn't behave properly 2018-05-25 10:05:50 -04:00
Nicole Thomas
cffc9b7806
Merge branch '2017.7' into fix_46981 2018-05-24 12:52:59 -04:00
twangboy
5656183c5e
Add timezone.list, add 2018.3.2 release notes 2018-05-23 14:18:30 -06:00
Nicole Thomas
dc7fd3aca0
Merge pull request #47801 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-05-23 16:12:58 -04:00
twangboy
81308a4a44
Add release notes for 2017.7.7 2018-05-23 13:47:08 -06:00
Gareth J. Greenaway
c1582c27d4
Adding an example of using reload_grains 2018-05-23 11:37:39 -07:00
rallytime
8d3c2be61c
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/kubernetes.py
  - salt/modules/opkg.py
  - salt/modules/useradd.py
  - salt/output/table_out.py
  - salt/states/mysql_query.py
  - salt/states/user.py
 2018-05-23 12:57:58 -04:00
rallytime
4abfd26e86
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
  - salt/fileclient.py
  - salt/output/__init__.py
  - salt/serializers/configparser.py
  - salt/states/pkg.py
  - salt/states/zpool.py
  - salt/transport/tcp.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_mac_user.py
  - tests/integration/modules/test_pip.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/modules/test_service.py
  - tests/integration/states/test_pip_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_cmdmod.py
 2018-05-23 12:33:00 -04:00
Nicole Thomas
0e87559ee3
Merge pull request #47781 from rallytime/update-linode-sizes 
Update cloud test profile and docs to use new Linode size lables
 2018-05-23 09:09:12 -04:00
Renat Zaripov
cf4669be8d Deleting duplicate description for SSH Port option in salt-cloud miscellaneous options topic 2018-05-23 15:36:29 +03:00
Nick Garber
859efe3fbd Issue #40975 
- The function signature `def map_run(path=None, **kwargs):`, so
   doesn't need to change.
 - Adding support for Cloud Maps in Pillar builds on the strength of the
   dynamic pillar-centric data organizing scheme.
 - in `Map.__init__`, a file path is read in as the class's
   `self.rendered_map` by the `Map.read` function, (which locates the file
   using the file path that the CloudClient is where most of the
   functionality is collected and it gets a copy of pillar values
   here (https://github.com/saltstack/salt/blob/develop/salt/cloud/init.py#L194-L206).

(doc)
 - added usage and precedence info to `map_run()` at modules/cloud.py
 - added example pillar to topics/cloud/config.rst
 - corrected YAML indentation of example 7 in topics/cloud/map.rst
 2018-05-22 17:45:39 -04:00
rallytime
1adb8ea27f
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-22 17:14:31 -04:00
rallytime
a90c1b760e
Update cloud test profile and docs to use new Linode size lables 
Linode changed their size labels recently, so the cloud test profile
and the docs need to be updated accordingly.

The new sizes can be found by running `salt-cloud --list-sizes <my-linode-config>`.

For example, the `Linode 2048` size is now `Linode 2GB`.
 2018-05-22 16:00:39 -04:00
Nicole Thomas
a59147c104
Merge branch 'develop' into ipaclient-group-auth-with-stringutils-support 2018-05-22 10:54:36 -04:00
rallytime
e458f4a031
Merge branch '2017.7.6' into '2017.7' 
No conflicts.
 2018-05-21 10:34:10 -04:00
Nicole Thomas
5777854d1f
Merge branch 'develop' into ssh_private_key_pass 2018-05-21 10:16:42 -04:00
Ch3LL
d4aa83b92d
Add changelog to 2017.7.6 release notes 2018-05-21 10:01:00 -04:00
Gareth J. Greenaway
5d23ef4dd8
Updating Beacon topic to include list based configuration for Beacons 2018-05-19 16:29:27 -07:00
Nicole Thomas
9f926bcd1a
Merge pull request #47541 from gtmanfred/2018.3 
switch skip-roster to update-roster
 2018-05-18 09:29:49 -04:00
plastikos
2ddd589f68
Merge branch 'develop' into improvement-spm-base_paths 2018-05-17 23:09:05 -06:00
Tanoti
cc47b059a5
Added information about freeipa 'groupattribute' search support in external auth system 2018-05-17 08:22:05 -05:00
Nicole Thomas
cb04d9c37e
Merge pull request #47661 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-16 11:53:35 -04:00
rallytime
969296ecbe
Merge branch '2018.3' into 'develop' 
No conflicts.
 2018-05-15 12:38:01 -04:00
plastikos
52248ff433
Merge branch 'develop' into improvement-spm-base_paths 2018-05-15 10:36:03 -06:00
rallytime
dd3e6f3f0a
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/states/pkgrepo.py
 2018-05-15 12:29:29 -04:00
Nicole Thomas
3ffa412ee5
Merge branch '2018.3' into 2018.3-salt-ssh-pillar-propagation-issue-47501 2018-05-15 11:15:02 -04:00
rallytime
2827c56399
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-14 10:57:50 -04:00
rallytime
1503f1020f
Merge branch '2017.7.6' into '2017.7' 
No conflicts.
 2018-05-14 10:56:21 -04:00
Nicole Thomas
e00451e0d1
Merge pull request #47567 from rallytime/cleanup-zabbix-imports 
Clean up import blocks in zabbix module
 2018-05-14 09:21:59 -04:00
Todd Wells
4038a8f764 fix ref in release notes 2018-05-12 11:39:07 -07:00
Todd Wells
45c85c9b40 Adding release notes 2018-05-12 11:37:28 -07:00
Mike Place
6d2ddd050f
One more grammar fixup 2018-05-11 11:32:33 -05:00
Mike Place
2d5ff01261
Grammar fix 2018-05-11 09:18:55 -05:00
Ch3LL
138847c9c4
Update debian install docs to reflect new latest debian releases 2018-05-11 09:51:50 -04:00
Nicole Thomas
4ec63dd041
Merge pull request #47589 from Ch3LL/watch_any_doc 
Remove duplicate file id in watch_any doc example
 2018-05-10 18:05:59 -04:00
Nicole Thomas
c68f5b49fa
Merge pull request #47566 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-05-10 18:03:58 -04:00
Nicole Thomas
9836a7e62b
Merge pull request #47564 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-10 15:13:35 -04:00
Ch3LL
8cb97a48f5
Add additional state to watch_any doc example 2018-05-10 14:34:44 -04:00
Ch3LL
f7223a3bbf
Remove duplicate file id in watch_any doc example 2018-05-10 09:30:03 -04:00
Mike Place
a8137026e4
Merge branch 'develop' into cleanup-zabbix-imports 2018-05-10 08:29:54 -05:00
rallytime
ca927fc14b
Add extra lines that are needed for proper code-block formatting 2018-05-09 16:10:31 -04:00
Nicole Thomas
ffe507d6aa
Merge pull request #47421 from bloomberg/nodegroup-topfile 
make pillar top_matches work with node groups
 2018-05-09 14:23:19 -04:00
rallytime
ade5e9f664 [2018.3.1] Update man pages 2018-05-09 18:17:22 +00:00
rallytime
b330d763a4
Remove infoblox state autodoc file 
This state does not exist. There is an execution module named infoblox, and
several other infoblox_x state fails, but not a pure infoblox.py state module.
 2018-05-09 14:06:55 -04:00
Daniel Wallace
8c5c780292
switch skip-roster to update-roster 2018-05-09 12:51:53 -05:00
rallytime
b88a228e5c
Update zabbix state module doc references 
The references in the index.rst file are necessary to build the zabbix
state module docs.
 2018-05-09 11:59:39 -04:00
rallytime
cf58ae22bf
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/states/pip_state.py
  - tests/unit/utils/test_stringutils.py
 2018-05-09 11:40:54 -04:00
rallytime
25f03ae425
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_status.py
  - tests/integration/states/test_pip_state.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-05-09 11:24:02 -04:00
Erik Johnson
806ffb298a
Add masterless mode docs to gitfs tutorial 2018-05-08 13:46:47 -05:00
Nicole Thomas
21809ddc02
Merge pull request #47514 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-08 14:36:53 -04:00
plastikos
2ab150cc0d
Merge branch 'develop' into improvement-spm-base_paths 2018-05-08 11:58:39 -06:00
Daniel Wallace
4d0bbc71ce
fix grammer 2018-05-08 11:18:31 -05:00
Mike Place
38048271f4
Merge pull request #47398 from slivik/zabbix_template_state 
Add state modules for Zabbix templates, actions and valuemaps
 2018-05-08 11:05:57 -05:00
Matei Albu
2f1485e067 Option to merge current pillar with opts['pillar'] during pillar compile 
Fixes #47501
 2018-05-08 17:42:40 +02:00
Matt Phillips
f1dbb5694f update docs to reference new feature 2018-05-08 09:42:23 -04:00
Daniel Wallace
92ded7162c
add ssh config doc for rosters 2018-05-07 17:25:38 -05:00
rallytime
48ecb78dec [2017.7.6] Update man pages 2018-05-07 20:31:38 +00:00
rallytime
53d2851826
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - salt/pillar/pillar_ldap.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2018-05-07 14:13:34 -04:00
rallytime
786076ac03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/cmdmod.py
  - salt/modules/pip.py
  - salt/modules/win_lgpo.py
  - salt/states/pip_state.py
  - tests/integration/states/test_pip.py
  - tests/support/helpers.py
  - tests/unit/modules/test_pip.py
  - tests/whitelist.txt
 2018-05-07 13:17:01 -04:00
Daniel Wallace
c86163d79f
add openstack modules to doc index.rst 2018-05-07 08:11:08 -05:00
Thayne Harbaugh
a66802c75a Various clean-ups, fixes and improvements to SPM directory references 
in the base paths used in syspaths.py.
 2018-05-04 17:41:57 -06:00
Nicole Thomas
8df37f734a
Merge pull request #47482 from gtmanfred/2018.3 
add all autodoc for new salt openstack modules
 2018-05-04 17:03:37 -04:00
Daniel Wozniak
439806b2bb
Merge branch 'develop' into pypsexec 2018-05-04 09:57:44 -07:00
Nicole Thomas
e8c4524bae
Merge pull request #47455 from Ch3LL/unreleased_rn 
Add In Progress Warning for 2017.7.6 Release Notes
 2018-05-04 09:44:54 -04:00
Nicole Thomas
47e994c672
Merge pull request #47437 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-05-03 16:05:06 -04:00
Erik Johnson
6d7803ece0
Fix docs build on Sphinx 1.7+ 
Sphinx 1.7 got rid of sphinx.utils.compat. This commit allows the builds
to work both on both older and newer Sphinx.
 2018-05-03 13:31:34 -05:00
Ch3LL
6a261e5e3a
Add In Progress Warning for 2018.3.1 Release Notes 2018-05-03 12:47:30 -04:00
Ch3LL
b6d0cc2ab7
Add In Progress Warning for 2017.7.6 Release Notes 2018-05-03 12:06:15 -04:00
Johan Ryberg
11856adea2
Changed to cloud_provider 
Changed incorrect parameter provider to cloud_provider
 2018-05-03 10:20:37 +02:00
rallytime
bd184a257f
Merge branch '2018.3' into 'develop' 
Conflicts:
  - tests/unit/grains/test_core.py
 2018-05-02 15:28:21 -04:00
Tanoti
c9a4382e02 Enable passing test=False as kwarg from orchestration file to minion in permanent test mode 2018-05-02 09:09:35 +00:00
Nicole Thomas
63baf4c4f8
Merge pull request #47417 from gtmanfred/slack 
revert instantiating a Caller Client in the engine
 2018-05-01 14:58:06 -04:00
Nicole Thomas
0bdfaa5ffe
Merge pull request #47368 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-01 14:56:19 -04:00
Mike Place
3785ee1d7d
Merge branch 'develop' into ssh_private_key_pass 2018-05-01 11:43:22 -05:00
Daniel Wallace
ee8a5eeb10
revert instantiating a Caller Client in the engine 
This Caller client prevents running the salt master as a non root user.  Also,
master processes are not assigned pillars so it is using whatever minion get
instantiated on the master from a caller client.

Instead, to use pillars, the engine should be started on in a minion process.
 2018-05-01 09:51:34 -05:00
Daniel Wallace
1f65d5cb73
add all autodoc for new salt openstack modules 2018-05-01 09:39:09 -05:00
rallytime
5a071c5ddf
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
 2018-04-30 16:33:13 -04:00
Daniel A. Wozniak
0816668975
clean up mis-spellings 2018-04-30 08:52:49 -07:00
esell
b2725f9858
add allocate_public_ip to docs 2018-04-30 09:29:51 -06:00
rallytime
3b40cdad2a
Add 2018.3.1 Release Notes 2018-04-30 09:35:46 -04:00
slivik
e5cf77d3d1
Add state modules for Zabbix templates, actions and valuemaps 2018-04-30 14:44:05 +02:00
Daniel A. Wozniak
86e25cf4f1
Add support for pypsexec and smbprotocol 
- Removes the need for winexe which is not packaged for all platforms we
  support. The replacement, pypsexec, is pure python so it will work
  everywhere.
- Add support for smbprotocol to be used instead of impacket.
  smbprotocol supports python 3 and is also used by pypsexec.
 2018-04-29 00:36:27 -07: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
13e8124031
Merge branch '2017.7' into '2018.3' 
Due to the many merge conflicts created from #47106 against the 2017.7 branch
and #46002 against the 2018.3 branch, the changes from #47106 have been largely
removed from this merge forward and the HEAD of 2018.3 was taken.

A separate fix for Tornado 5.0 support will need to be made directly against the
2018.3 branch.

Conflicts:
  - doc/topics/development/conventions/formulas.rst
  - salt/master.py
  - salt/minion.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/zfs.py
  - salt/transport/ipc.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/async.py
  - tests/support/helpers.py
  - tests/support/parser/cover.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_ssh.py
  - tests/unit/test_minion.py
  - tests/unit/utils/test_safe_walk.py
 2018-04-27 13:38:35 -04:00
Daniel Wallace
6214ed8133
add mention of the formulas channel to the formulas docs 2018-04-27 08:45:10 -05:00
Erik Johnson
dd4b0de0e0
Add release notes for dropping of virtual package support 2018-04-26 23:21:36 -05:00
Brandon Kurtz
12ac26086e
fixing typo 2018-04-26 13:12:13 -04:00
Mike Place
33c0644ac4
Credit Frank Spierings 2018-04-26 11:29:51 -05:00
Nicole Thomas
ebd190dedc
Merge branch 'develop' into ssh_private_key_pass 2018-04-26 10:35:44 -04:00
rallytime
9aeb5e78f2
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/zfs.py
  - salt/modules/zpool.py
  - salt/states/zfs.py
  - salt/states/zpool.py
  - salt/utils/vault.py
  - salt/utils/zfs.py
  - tests/unit/utils/test_zfs.py
 2018-04-25 14:50:36 -04:00
Banio Carpenter
b97c9df5f3 added clarity on how to figure out what is the oldest supported main release branch 2018-04-25 10:59:22 -05:00
Nicole Thomas
29e683bea6
Merge pull request #47243 from cbosdo/libvirt_engine_autoconnect 
virt connection improvements
 2018-04-25 09:59:24 -04:00
Nicole Thomas
f3cecd560c
Merge branch 'develop' into ssh_private_key_pass 2018-04-25 09:39:13 -04:00
pengyao
9a96d98765 Remove priv_passwd for salt-ssh man page 
It will be updated when packaged
 2018-04-25 10:34:56 +08:00
Scott Page
01980b4c43
Fix topics/releases/2018.3.0.rst to include correct example of proxy_example beacon yaml configuration. 2018-04-25 10:12:00 +09:00
Scott Page
9682e26eec
Fix topics/proxyminion/beacon.rst to include correct example of salt_proxy beacon yaml configuration. 2018-04-25 10:10:21 +09:00
Cedric Bosdonnat
09e1d7fab4
Merge branch 'develop' into libvirt_engine_autoconnect 2018-04-24 08:52:39 +02:00
pengyao
39cb55a666 Add docs for ssh_priv_passwd 2018-04-24 10:48:29 +08:00
Amel Ajdinovic
615866032b Added create block storage support. 
Added ssh key support.

Added documentation
 2018-04-23 23:16:36 +02:00
Nicole Thomas
15895c4ff8
Merge pull request #47214 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-04-23 17:05:29 -04:00
Ch3LL
fa4c2e6575
Update Docs to remove unnecessary + sign 2018-04-23 15:35:04 -04:00
Ch3LL
24dea24b7e
Add CVE number to 2016.3.6 Release 2018-04-23 15:03:48 -04:00
Nicole Thomas
706b9b7d84
Merge pull request #47187 from azelezni/add-thorium-gitfs-support 
Add gitfs support for Thorium
 2018-04-23 12:41:58 -04:00
Cédric Bosdonnat
3d3ed786cd
virt module: actually deprecate virt.nic option 
virt.nic is considered as the old version of virt:nic in the code, but
there is no warning of this. The documentation is also still mentioning
virt.nic. Updating it all to move to virt:nic
 2018-04-23 15:21:19 +02:00
Cédric Bosdonnat
6858c9931a
virt module: move virt.images to virt:images 
To continue the virt module options harmonization, deprecate virt.images
in favor of virt:images and add documentation on this option.
 2018-04-23 15:21:17 +02:00
Cédric Bosdonnat
20048c6fca
virt module: convert virt.tunnel into virt:tunnel 
To continue the virt module options harmonization, deprecate virt.tunnel
in favor of virt:tunnel and add documentation on this option.
 2018-04-23 15:21:16 +02:00
David Boucha
051c8ea167
Fix develop branch version definition 2018-04-20 17:21:23 -06:00
rallytime
0eab957281
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_git.py
  - tests/unit/modules/test_tls.py
 2018-04-20 15:40:49 -04:00
rallytime
4718d31e53
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/pip.py
  - salt/states/pip_state.py
  - salt/states/virtualenv_mod.py
  - tests/integration/modules/test_status.py
 2018-04-19 17:15:20 -04:00
Alex Zeleznikov
969a2502f4 Add gitfs support for Thorium 
Allow thorium to use gitfs with a mountpoint or saltenv.
Fixes #47119
 2018-04-19 21:23:53 +03:00
rallytime
0039395017
Updage jenkins module autodocs to use jenkinsmod name instead 
Refs #46801

The jenkins module was renamed to jenkinsmod recently, but the autodoc
files were never updated.

We need to remove the jenkins.py docs from the docbuild server, but we
can't do that if the new docs for jenkinsmod.py aren't building yet.

This PR updates the autodoc files to point to the new file.
 2018-04-18 15:14:30 -04:00
Erik Johnson
09dcb8ffce
Merge pull request #47084 from bloomberg/26396-docpatch 
GH-26396, add a clarification on pillar merge strategy
 2018-04-17 16:33:22 -05:00
Nicole Thomas
99debdd1cb
Merge pull request #47111 from terminalmage/default-renderer 
Update default renderer to jinja|yaml, improve renderer docs
 2018-04-17 16:47:33 -04:00
rallytime
abe2309c91
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
 2018-04-17 11:50:01 -04:00
rallytime
94c2a12be6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_state.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/test_minion.py
 2018-04-17 10:54:42 -04:00
Matt Phillips
3755489e6b GH-26396, add a clarification on pillar merge strategy 
make it clear what is required for yamlex behavior cross-sls.
 2018-04-17 09:57:18 -04:00
Erik Johnson
7070a3be48
Update default renderer to jinja|yaml, improve renderer docs 
`yaml_jinja` and all legacy renderer syntax has been transparently
translated to the render pipeline syntax (e.g `jinja|yaml`)
under-the-hood for several years now, this just makes the default
renderer adhere to the render pipeline syntax.

It also makes significant improvements to the renderer documentation.
 2018-04-16 22:35:23 -05:00
Erik Johnson
af43b7b090
Add file.patch rewrite info to Fluorine release notes 2018-04-13 12:40:11 -05:00
Cory Wright
9b7ee97d12
Fix copy/paste typo in minionfs tutorial 2018-04-13 11:52:41 -04:00
twangboy
6635b9003f
Fix winrm powershell script 
Removes the `Hostname` paramater in the winrm create command. It is not
needed. It must match the hostname on the certificate, which is not
defined in the case of the Remote Desktop certificate
Removes extra spaces
 2018-04-12 14:41:19 -06:00
Mike Place
9e13b5fd81
Merge pull request #46892 from samilaine/update-doc-topics-event-events 
Working Python examples for the event documentation.
 2018-04-12 13:59:56 -06:00
Mike Place
800a91bf45
Merge pull request #47005 from ari/patch-3 
Remove salt FreeBSD repo which is now 2 years out of date
 2018-04-12 13:52:03 -06:00
rallytime
fe10957ce0
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
 2018-04-12 11:00:14 -04:00
Mike Place
cbe1cfa4d9
Merge pull request #46684 from isbm/isbm-saltssh-multimajor-py-version-support 
SaltSSH cross-major version support
 2018-04-11 12:31:31 -06:00
Cory Wright
bd0918fc40
Add auth.file module to auth documentation page 2018-04-11 11:40:00 -04:00
Ari Maniatis
5db36d7bdb
Remove salt FreeBSD repo which is now 2 years out of date 
The saltstack repository has the 2016 version is current. Its not being updated, but there is a perfectly good port in the FreeBSD tree to use instead. Enhance the documentation on how to install that from binary or source.
 2018-04-11 08:39:26 +10:00
Amir Pakdel
1a8a7e3841
Merge branch 'develop' into ec2_image_name 2018-04-09 11:49:14 -04:00
Sami Laine
8477465d2a Review comments from @cachedout incorporated. 2018-04-09 10:05:30 +03:00
Denys Havrysh
bfdf54e61d
[DOC] Fix Jinja block in FAQ page 
Closes #18835
 2018-04-08 12:19:48 +03:00
Bo Maryniuk
cd32f14406 Re-phrase docstring for alternative Salt installation 2018-04-06 17:38:14 +02:00
Bo Maryniuk
448944a317 Rephrase Salt SSH doc description 2018-04-06 17:38:14 +02:00
Bo Maryniuk
a0dd7a76e0 Add documentation about updated Salt SSH features 2018-04-06 17:38:14 +02:00
rallytime
5b50eaf6b0
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/ref/proxy/all/salt.proxy.cimc.rst
  - doc/ref/proxy/all/salt.proxy.panos.rst
  - doc/topics/releases/2018.3.0.rst
  - salt/modules/cmdmod.py
  - salt/modules/state.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_state.py
 2018-04-05 13:25:46 -04:00
Mike Place
bc66641dd2
Merge branch 'develop' into ec2_image_name 2018-04-05 09:40:49 -05:00
Sami Laine
6e56dcac6b Actually working Python examples for the event documentation. 2018-04-05 15:40:12 +03:00