Commit Graph

8927 Commits

Author SHA1 Message Date
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
rallytime
f46d4e0a26
[develop] Fluorine deprecations in cloud util (and related functions)
Since `Fluorine` was misspelled in a couple of places and subsequently fixed,
the removal of the `cache_nodes_ip` function was missed.

This PR removes the deprecated `cache_nodes_ip` function from salt.utils.cloud.

This PR also updates some of the warn_util versions to match the removal/support
warning message. The `warn_util` version was set to `Fluorine`, but the "will be
removed in version" message stated Sodium. Sodium is the correct version, so the
docs and warn_util versions have been corrected.
2018-07-30 11:46:13 -04:00
Mike Place
c936aaa64d
Merge branch 'develop' into proxycaller 2018-07-27 10:26:53 -06:00
rallytime
436510796f
Merge branch '2017.7' into '2018.3'
No conflicts.
2018-07-27 11:44:07 -04:00
rallytime
5123b17ffd
Update linting docs to contain .testing.pylintrc use
The PR tests use the ``.testing.pylintrc`` file, rather than the
more restrictive ``.pylintrc`` file. This can be a point of confusion
when following the current documentation.

The docs should reference the testing file and that the Jenkins PR
tests use ``.testing.pylintrc`` instead of ``.pylintrc``.

Fixes #48417
2018-07-27 09:09:28 -04:00
Nicole Thomas
f05b86979a
Merge branch 'develop' into fix-40532 2018-07-26 14:20:48 -04:00
Nicole Thomas
a7dc3ddcc8
Merge pull request #48762 from mirceaulinic/rm-template-mod
Get rid of the template module and rework a couple of modules
2018-07-26 11:42:15 -04:00
Mircea Ulinic
2ce61a3377 Add the PeeringDB execution module to autodoc 2018-07-26 06:49:23 +00:00
Nicole Thomas
816f7edc81
Merge pull request #48716 from thetoolsmith/develop
add salt cloud support for block device tagging or root devices and such
2018-07-25 11:07:56 -04:00
Ch3LL
e760c8466a
Update Saltstack Logo banner on docs.saltstack.com 2018-07-25 10:43:37 -04:00
Ch3LL
0cb4bac798
Update Saltstack Logo banner on docs.saltstack.com 2018-07-25 10:41:43 -04:00
Mircea Ulinic
11fe1fc010 Revert "Adding the template module for autodoc"
This reverts commit e369357ff3.
2018-07-25 08:30:16 +00:00
Paul Bruno
0d4ad6eac1 improve document example 2018-07-24 16:31:08 -04:00
Paul Bruno
faa57c76a8 make recommended changes, update documentation 2018-07-24 16:27:46 -04:00
Ch3LL
73b1fc29f0
Update Saltstack Logo banner on docs.saltstack.com 2018-07-24 16:01:49 -04:00
Nicole Thomas
8958c30d13
Merge pull request #48687 from mirceaulinic/jira-mod
Adding a new execution module to manipulate JIRA tickets
2018-07-24 13:48:47 -04:00
Nicole Thomas
968e2e0b9e
Merge pull request #48713 from rallytime/merge-develop
[develop] Merge forward from 2018.3 to develop
2018-07-24 13:39:30 -04:00
rallytime
1397d72efe
Update DOCBANNER with new SaltConf18 image
And remove enterprise ad
2018-07-24 13:16:32 -04:00
rallytime
dbc1f8b772
Update DOCBANNER with new SaltConf18 image
And remove enterprise ad
2018-07-24 13:14:42 -04:00
rallytime
6df8fd8652
Update DOCBANNER with new SaltConf18 image
And remove enterprise ad
2018-07-24 12:44:19 -04:00
Mircea Ulinic
e4d03b8831 The napalm module has been renamed, updating the autodoc 2018-07-24 13:01:51 +00:00
Mircea Ulinic
32b17bfa72 Add ciscoconfparse mdoule to autodoc 2018-07-24 12:49:28 +00:00
Nicole Thomas
70e75c2be6
Merge branch 'develop' into jira-mod 2018-07-23 18:15:15 -04:00
Nicole Thomas
031741f079
Merge pull request #48697 from dgengtek/feature/ldap-starttls
Feature: ldap authentication with starttls
2018-07-23 15:43:50 -04:00
rallytime
597fc8009b
Merge branch '2018.3' into 'develop'
Conflicts:
  - salt/grains/core.py
2018-07-23 11:54:19 -04:00
Mircea Ulinic
2ae5a26d05 Add autodoc for the modules.jira_mod 2018-07-23 14:12:20 +00:00
Marc-Aurèle Brothier
54fa5f231e
cloudstack: fix wrong attribute name in doc 2018-07-23 15:55:54 +02:00
Nicole Thomas
9d176ab8e3
Merge branch 'develop' into fix-40532 2018-07-23 09:39:09 -04:00
Erik Johnson
7ad832c901
Add missing release notes mention of file.blockreplace changes
These were added to the docstrings but not to the release notes for the
releases where the change took place.
2018-07-21 10:12:52 -05:00
dgengtek
aa6458e441 Feature: ldap authentication with starttls
fix #48655
2018-07-21 14:23:59 +02:00
Nicole Thomas
3baa31886c
Merge pull request #48356 from mirceaulinic/pyeapi-modules
Adding a pair of proxy and execution modules for managing Arista switches via the pyeapi
2018-07-20 09:32:44 -04:00
Bruno Binet
32b6d22cf2 Fix RST syntax issue in doc 2018-07-20 13:57:22 +02:00
Bruno Binet
37a41226d5 Add the "traverse" jinja filter
which can be really useful in states to select some leaf pillar data or
fallback with a default value.
2018-07-19 17:59:30 +02:00
Nicole Thomas
ff3ff80ebe
Merge pull request #48541 from mirceaulinic/nxos-api-mod
Adding a pair of Proxy and Execution modules for managing Cisco Nexus switches via the NX-API
2018-07-16 10:20:30 -04:00
Nicole Thomas
f0fc854ed4
Merge pull request #48532 from terminalmage/chipy
Enhancements to slack engine and wtmp beacon
2018-07-13 16:45:46 -04:00
Nicole Thomas
490d7fb62c
Merge pull request #48254 from gtmanfred/ansible
add ansible playbook runner to ansiblegate module
2018-07-13 15:26:49 -04:00
Erik Johnson
04cbdd0a67
Double backticks for RST 2018-07-13 10:48:55 -05:00
rallytime
6c8fb063ac
Merge branch '2018.3' into 'develop'
No conflicts.
2018-07-13 11:00:26 -04:00
rallytime
ae201823c1
Deprecate 'master_shuffle' in favor of 'random_master' 2018-07-12 13:43:06 -04:00
Erik Johnson
85eac61ccc
Add release notes for engine/beacon changes 2018-07-12 12:29:49 -05:00
Daniel Wallace
b0a2963132
Merge branch 'develop' into proxycaller 2018-07-12 11:44:01 -05:00
Daniel Wallace
0e0ed41329
add to fluorine release notes 2018-07-12 11:29:37 -05:00
SaltStack Jenkins
69264f3332
Merge pull request #48446 from eugene-davis/influx-user-fixes
Influx module user fixes
2018-07-12 08:17:22 -05:00
Mircea Ulinic
e69877ed3b Add nxos_api modules to autodoc 2018-07-12 13:08:06 +00:00
Simon Sapin
c3bb0b9c14
Walkthrough: define the SLS accronym
Some Googling suggests this is what it means.
2018-07-11 21:09:17 +02:00
rallytime
29b05ffdd1
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
  - pkg/windows/req.txt
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_npm.py
2018-07-11 14:49:27 -04:00
Renat Zaripov
6b69f196f8 Little fix in Vagrant cloud topic 2018-07-11 18:10:41 +03:00
Mircea Ulinic
1e7350be41 Add autodoc for the arista_pyeapi execution module 2018-07-11 11:03:01 +00:00
Mircea Ulinic
d763ca7478 Add autodoc for the arista_pyeapi proxy module 2018-07-11 11:03:00 +00:00
rallytime
a466a4880f
Merge branch '2017.7.7' into '2017.7'
No conflicts.
2018-07-10 16:49:13 -04:00
Eugene Davis
722e5a3d86 Update fluorine release notes with state module change 2018-07-10 17:48:45 +02:00
rallytime
da646cb44f
Merge branch '2018.3' into 'develop'
Conflicts:
  - doc/topics/event/events.rst
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
2018-07-09 10:40:23 -04:00
Nicole Thomas
b8f2a86638
Merge pull request #48456 from cvedel/issue_48455
support RunOnce in the VMware salt-cloud driver
2018-07-09 09:42:24 -04:00
Carsten Brandt
6d9e83b8bd
Make example Saltfile work by default
without Saltfile:

```
$ salt-ssh --saltfile=Saltfil '*' test.ping
No permissions to access "/var/log/salt/ssh", are you running as the correct user?
```

Adding a log file to the example Saltfile makes everything work as expected.
2018-07-09 14:55:24 +02:00
Erik Johnson
56e8a1eb93
Improve the slack engine docs
This explains the target/tgt_type options, adds some usage examples, and
makes a few other documentation tweaks.
2018-07-07 21:41:01 -05:00
Daniel Wallace
60661b4cd0
document minions required on save_load 2018-07-06 10:01:11 -05:00
Christophe Vedel
b274ab78a7 support RunOnce in the VMware salt-cloud driver 2018-07-05 22:27:05 +02:00
rallytime
b55aa5b946
Merge branch '2018.3' into 'develop'
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/netapi/rest_tornado/saltnado.py
2018-07-03 16:07:46 -04:00
Daniel Wallace
8df59d6167
hopefully the last few changes. 2018-07-03 10:39:25 -05:00
Ch3LL
3cf335b0b9
Update release versions for the 2017.7 branch 2018-07-03 09:37:58 -04:00
Ch3LL
84a1994110
Update release versions for the 2018.3 branch 2018-07-03 09:35:12 -04:00
Ch3LL
ef288f2a74
[2018.3] Remove In Progress Warning on 2017.7.7 2018-07-03 09:32:34 -04:00
Ch3LL
03ed5167fa
[2017.7] Remove In Progress Warning on 2017.7.7 2018-07-03 09:31:02 -04:00
Nicole Thomas
5b38019ca0
Merge pull request #48339 from terminalmage/backport-tojson-filter
Backport tojson filter from #48309 to 2018.3
2018-07-02 13:52:52 -04:00
Ch3LL
0cfd233c0e
[develop] Remove In Progress Warning on 2017.7.7 2018-07-02 10:23:42 -04:00
Mike Place
74497da15c
Merge pull request #48387 from Ch3LL/1update_version_doc_develop
Update release versions for the develop branch
2018-06-30 22:18:10 -06:00
rallytime
bf6c788350
Merge branch '2018.3' into 'develop'
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/utils/thin.py
2018-06-30 09:48:06 -04:00
Nicole Thomas
fdd1f24567
Merge pull request #48309 from terminalmage/fix-yaml-hacks
Drop support for Python 2 unicode string literals in YAML renderer
2018-06-30 09:07:55 -04:00
Nicole Thomas
fbbafc8de4
Merge pull request #48300 from rallytime/merge-develop
[develop] Merge forward from 2018.3 to develop
2018-06-30 08:58:27 -04:00
Nicole Thomas
89857ea8b9
Merge pull request #48297 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-06-30 08:57:34 -04:00
Ch3LL
6956e4e8ae
Update release versions for the develop branch 2018-06-29 16:41:40 -04:00
Daniel Wallace
068cc84e9c
add notes to the docs 2018-06-28 13:38:31 -05:00
rallytime
fface7cc74
Merge branch '2018.3.2' into '2018.3'
Conflicts:
  - tests/integration/runners/test_state.py
2018-06-28 10:05:18 -04:00
Erik Johnson
4433bec891
Add release notes for tojson jinja filter 2018-06-27 12:36:30 -05:00
Erik Johnson
ac36998801
Tweak docs to reflect backported filter 2018-06-27 12:28:34 -05:00
Erik Johnson
2320c8513c
Tweak docs to reflect backported filter 2018-06-27 12:27:47 -05:00
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