valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
96,682 Commits 24 Branches 182 Tags 341 MiB
f6a566604e
Commit Graph

8773 Commits

Author SHA1 Message Date
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
Nicole Thomas
58c8ff18e2
Merge pull request #46870 from cloudflare/proxy-doc 
Correct the documentation for two new proxy modules
 2018-04-04 17:48:40 -04:00
Nicole Thomas
2a84c9595a
Merge pull request #46448 from ogd-software/allow_failhard_override 
Made state-level failhard override global failhard.
 2018-04-04 17:12:00 -04:00
Amir Pakdel
6d649a948d Added a bit a doc for Amazon EC2 AMI name 2018-04-04 14:59:19 -04:00
Mircea Ulinic
f4b6184476 Corect and add the cimc proxy module to autodoc 2018-04-04 15:07:32 +00:00
Mircea Ulinic
a99bc202b9 Correct & add Panos to autodoc 2018-04-04 15:07:32 +00:00
Nicole Thomas
c998e78570
Merge pull request #46833 from samilaine/pillar-include-missing-documentation 
Document the ignore_missing parameter for the pillar top file.
 2018-04-04 10:50:42 -04:00
Nicole Thomas
92328dc0ed
Merge pull request #46724 from StackPointCloud/reserve_public_ip 
Reserve public IP block
 2018-04-04 09:57:43 -04:00
Herbert
a74c90584f
Merge branch 'develop' into allow_failhard_override 2018-04-04 10:40:52 +02:00
Sami Laine
2e2c32e6ac Typofix. 2018-04-04 10:39:18 +03:00
rallytime
ab2ccea1af
Quick grammar fix in 2018.3.0 release notes 2018-04-03 15:02:17 -04:00
David Boucha
af7bad3c7f
Fix warning format in 2018.3.0 release notes 2018-04-03 15:01:33 -04:00
David Boucha
37a04357b9
Fix warning format in 2018.3.0 release notes 2018-04-03 11:40:35 -06:00
Nicole Thomas
a0e168ccee
Merge pull request #46836 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.0rc1 to 2018.3
 2018-04-03 12:54:53 -04:00
Megan Wilhite
307e7f35f9
Merge pull request #46740 from rallytime/2017.7_update_version_doc 
Update release versions for the 2017.7 branch
 2018-04-03 10:36:06 -04:00
rallytime
e75ba1f502
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - doc/topics/releases/2018.3.0.rst
 2018-04-03 10:27:23 -04:00
Megan Wilhite
4d7396a071
Merge pull request #46741 from rallytime/develop_update_version_doc 
Update release versions for the develop branch
 2018-04-03 10:25:37 -04:00
Sami Laine
bfb5bdb0af Document the ignore_missing parameter for the pillar top file. 2018-04-03 16:09:51 +03:00
Nicole Thomas
de4d9ac129
Merge pull request #46695 from StackPointCloud/public_private_ip 
Set public and private IP addresses
 2018-04-03 08:45:58 -04:00
Nicole Thomas
3c741d5a08
Merge pull request #46722 from rallytime/fix-46721 
Remove support for "profile" in vault util module
 2018-04-03 08:41:32 -04:00
denza
14671418d8 Merge branch 'develop' of github.com:saltstack/salt into reserve_public_ip 2018-04-02 23:52:40 +02:00
denza
01f56f6ac5 Merge branch 'develop' of github.com:saltstack/salt into public_private_ip 2018-04-02 23:51:51 +02:00
rallytime
274f8ee0dd
[2018.3] Update the latest release information for docs 
- 2018.3.0 is new stable release
- 2017.7.5 is new previous stable release
- 2018.3 branch is the "latest" release branch
 2018-04-02 15:12:16 -04:00
rallytime
b5e1007db2
Update previous and latest release versions for develop 2018-04-02 15:09:09 -04:00
rallytime
7edf98d224
Update 2018.3.0 information and move branch from "latest" to "previous" 2018-04-02 15:05:36 -04:00
Damon Atkins
db5b9464e6
provided an example 2018-03-31 02:20:07 +11:00
Damon Atkins
41e3e1e253
Update windows information in release notes 2018-03-31 02:07:50 +11:00
Damon Atkins
99447fbf49
Added more windows information 2018-03-31 02:05:26 +11:00
Damon Atkins
d4241006f2
Update 2018.3.0.rst Windows Items, Group topics 
Added windows changes and fixed headings and group similar items.
 2018-03-31 01:28:12 +11:00
Ethan Devenport
fc67261e65
Merge branch 'develop' into public_private_ip 2018-03-29 11:31:04 -06:00
Nick Zeljkovic
41960137a8
Merge branch 'develop' into configserializer 2018-03-29 18:27:23 +02:00
Nicole Thomas
6fb83b7c83
Merge pull request #46694 from StackPointCloud/volume_password 
Volume password
 2018-03-29 10:10:11 -04:00
Nicole Thomas
e5b3c8fa91
Merge pull request #46746 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-03-28 17:13:06 -04:00
Nicole Thomas
8267ced689
Merge pull request #46719 from rallytime/fix-46467 
Remove support for expr_form
 2018-03-28 17:11:08 -04:00
rallytime
e8864b7b0b
Merge branch '2017.7' into '2018.3' 2018-03-28 13:52:28 -04:00
Erik Johnson
885c60e7d4
Add serializer_opts feature to Fluorine release notes 2018-03-28 09:56:15 -05:00
Denys Havrysh
a1cc55da3d
[DOC] Remove mentions of COPR repo from RHEL installation page 
Fixes #28142
 2018-03-28 12:30:07 +03:00
denza
01cf2aef62 Merge branch 'develop' of github.com:saltstack/salt into reserve_public_ip 2018-03-28 05:41:27 +02:00
denza
377d0c085f Merge branch 'develop' of github.com:saltstack/salt into public_private_ip 2018-03-28 05:40:18 +02:00
denza
0e52faf8e7 Merge branch 'develop' of github.com:saltstack/salt into volume_password 2018-03-28 05:39:27 +02:00
denza
f53e186411 Fixing typo 2018-03-28 05:19:15 +02:00
Nicole Thomas
65bb37effd
Merge pull request #46720 from rallytime/bump-nacl-deprecation 
Bump deprecation notices in nacl module & runner to Neon
 2018-03-27 17:15:45 -04:00
rallytime
e312efb5e7
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/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
 2018-03-27 16:31:55 -04:00
rallytime
0dfc4eeb41
Update release versions for the develop branch 2018-03-27 14:25:20 -04:00
rallytime
5336e866ac
Update release versions for the 2017.7 branch 2018-03-27 14:25:16 -04:00
rallytime
2c4668a5cb
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/kubernetes.py
  - salt/states/netconfig.py
  - salt/states/zfs.py
  - tests/integration/cloud/providers/test_profitbricks.py
  - tests/integration/scheduler/test_eval.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-27 11:57:29 -04:00
rallytime
00d4eb26f3
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - pkg/windows/req.txt
 2018-03-27 11:41:56 -04:00
rallytime
00490ec569
Update Fluorine release notes to use double back-ticks instead of single back-ticks 
RST formatting needs double backticks to properly display `code` font markings. The
use of single backticks is used in markdown.
 2018-03-27 11:27:12 -04:00
rallytime
b7491d9cd7
Update Fluorine release notes with link to vault module docs 2018-03-27 11:25:57 -04:00
rallytime
3cd716b349
Add example to release notes about tgt_type usage 2018-03-27 11:18:23 -04:00
denza
37ebb1e419 Adding a version tag 2018-03-26 23:23:51 +02:00
denza
9e582c2240 Adding a version tag 2018-03-26 23:21:42 +02:00
denza
ad9009b1c0 Adding a version tag 2018-03-26 23:19:17 +02:00
rallytime
a0035bf5ad
Remove support for "profile" in vault util module 
This was marked for removal in the Fluorine release.
 2018-03-26 17:13:00 -04:00
rallytime
5102c0310c
Bump deprecation notices in nacl module & runner to Neon 
These were initially marked for removal in "Fluorine", but we need
to give users 2 feature releases to update. The version that the
options will be removed in is "Neon". The related references have
been updated, as well as the relevant documentation.
 2018-03-26 17:00:25 -04:00
Denys Havrysh
d0929280fc
[DOC] Update FAQ about Salt self-restarting 
Fixes #5721
 2018-03-26 23:38:45 +03:00
rallytime
88c2c1b405
Remove support for expr_form 
This option has been deprecated and marked for removal in Fluorine.

``tgt_type`` should be used instead.
 2018-03-26 16:15:08 -04:00
Nicole Thomas
5d9ef58bb1
Merge pull request #46607 from rallytime/fix-46473 
Remove support for template_path in napalm_network module and netconfig state
 2018-03-26 15:03:02 -04:00
Nicole Thomas
fadc5e4ba4
Merge pull request #46669 from terminalmage/pillar-merge-order 
Add option to return to pre-2017.7.3 pillar include merge order
 2018-03-26 15:00:27 -04:00
twangboy
ab619be5ab
Update the release notes to match the docs 2018-03-26 12:45:44 -06:00
Amir Pakdel
2dfaa25e37
Merge branch 'develop' into ec2_image_name 2018-03-26 13:27:26 -04:00
Amir Pakdel
63a74eb2fe Salt Cloud EC2: Image Name 2018-03-26 13:21:17 -04:00
cwlinode
8b8f9125cd
Update linode.rst 
Following this page to store profiles in `cloud.profiles.d/`, `salt-cloud -p linode_1024 linode-instance` returns the error below unless the profile is named with a `.conf` file extension.

```
[ERROR   ] Profile linode_1024 is not defined
Error:
    Profile linode_1024 is not defined
```
 2018-03-26 11:33:16 -04:00
Nicole Thomas
03b58a01cf
Merge pull request #46645 from terminalmage/release-notes 
Add Unicode / Python 3 update to 2018.3.0 release notes
 2018-03-26 10:43:53 -04:00
rallytime
a173246bdf
Remove support for template_path in napalm_network module and netconfig state 2018-03-26 10:27:04 -04:00
denza
c2ad95c7df Match Profitbricks naming convention 2018-03-26 00:22:31 +02:00
Erik Johnson
b4a1d34b47
Add option to return to pre-2017.7.3 pillar include merge order 
https://github.com/saltstack/salt/pull/45025 changed the pillar include
merge order. This adds a new config option which allows a user to revert
to the pre-2017.7.3 behavior.
 2018-03-22 13:35:12 -05:00
Erik Johnson
986c7bcdae
Rewrite unicode/py3 section 2018-03-22 09:39:06 -05:00
denza
47b5112609 Merge branch 'develop' of github.com:StackPointCloud/salt into reserve_public_ip 2018-03-21 22:45:01 +01:00
denza
fb0aedbff4 Merge branch 'develop' of github.com:StackPointCloud/salt into public_private_ip 2018-03-21 22:43:01 +01:00
denza
76944f60ce Merge branch 'develop' of github.com:StackPointCloud/salt into volume_password 2018-03-21 22:41:59 +01:00
Mike Place
2e1f7c37f7
Merge pull request #46569 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-03-21 20:57:04 +00:00
Mike Place
36e2db8657
Merge pull request #46605 from rallytime/fix-46469 
Remove deprecated functions in trafficserver module and state
 2018-03-21 20:10:37 +00:00
Erik Johnson
064bc83276
Add Unicode / Python 3 update to 2018.3.0 release notes 2018-03-21 12:40:10 -05:00
Denys Havrysh
51e6aa54a1
[DOC] Unify cloud modules index header 2018-03-21 17:17:28 +02:00
Nicole Thomas
f77f0efef7
Merge pull request #46522 from rallytime/state-deprecations 
Handle some of the state deprecations for Fluorine
 2018-03-20 16:15:54 -04:00
Nicole Thomas
de848c5fb9
Merge pull request #46582 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-03-20 09:30:40 -04:00
rallytime
58a0448de0
Remove deprecated functions in trafficserver module and state 2018-03-20 09:27:58 -04:00
Nicole Thomas
a7c93fdd63
Merge branch 'develop' into state-deprecations 2018-03-20 09:18:53 -04:00
Nicole Thomas
f3d7f7d40d
Merge pull request #46586 from rallytime/fix-46468 
Handle the win_update and win_wua deprecations for Fluorine
 2018-03-20 09:17:28 -04:00
rallytime
b03cda3cea
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-20 09:13:13 -04:00
Ch3LL
6076bfa2ee
Add changelog to 2017.7.5 release 2018-03-19 16:36:41 -04:00
rallytime
a7a1b293c7
Fix typo in pillar docs 
datj --> data

Fixes #46585
 2018-03-19 12:59:54 -04:00
Ch3LL
6eab6a7dc4
add autodoc topics for infoblox state modules 2018-03-19 11:06:37 -04:00
Nicole Thomas
20ed81f009
Fix typo 2018-03-19 08:00:15 -04:00
Nicole Thomas
93ab582230
Small grammar fix to new grains settings 2018-03-19 07:59:41 -04:00
Simon Dodsley
a64790c670 Add autodoc file for new purefb execution module 2018-03-16 21:02:00 -04:00
rallytime
0568474f57
Handle the win_update and win_wua deprecations for Fluorine 
The `win_update` execution and state modules were marked for removal
in the Fluorine release, along with several functions in the win_wua
execution module.
 2018-03-16 17:07:46 -04:00
rallytime
f31bc41083
Revert "Remove deprecated mongodb_user state" 
This reverts commit 2e3bc07cf2.
 2018-03-16 15:39:28 -04:00
rallytime
c1cff82458
Revert "Remove deprecated monggodb_database state" 
This reverts commit 8ded32b84a.
 2018-03-16 15:39:19 -04:00
twangboy
352eae3ffe
Add configuration options to docs and release notes 
Remove __proxyenabled__ from the two new grains files.
 2018-03-16 13:27:12 -06:00
rallytime
71178940e3
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/states/pip_state.py
  - salt/utils/schedule.py
 2018-03-16 15:09:16 -04:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-15 17:22:05 -04:00
Nicole Thomas
c9d91b2e99
Merge pull request #46528 from mkobit/mk/touchup-references 
Touch up glossary references
 2018-03-15 13:24:39 -04:00
Herbert
a8be7778ad
Merge branch 'develop' into allow_failhard_override 2018-03-14 10:21:16 +01:00
Mike Kobit
4ac2c01356
Touch up glossary references 
Signed-off-by: Mike Kobit <mkobit@gmail.com>
 2018-03-13 17:28:54 -05:00
Nicole Thomas
9c8573e473
Merge pull request #46499 from rallytime/fix-46475 
Remove deprecated syntax for "profile" in vault pillar
 2018-03-13 16:03:05 -04:00
rallytime
70097e32b4
Remove the deprecated 'driver' option from docker_network.absent 
This option had no functionality and was marked for removal in the Fluorine release.
 2018-03-13 14:15:27 -04:00
rallytime
57091c05f7
Remove deprecated docker state 
All functions in the docker state was deprecated and marked for removal in the
Fluorine release. Since no functions would remain in the state, the state has
been removed.
 2018-03-13 14:09:19 -04:00
rallytime
30e499198c
Remove support for the "ref" option in the git.detached state 
This code was marked for removal in the Fluorine release. "rev" should
be used instead.
 2018-03-13 13:54:52 -04:00
rallytime
8ded32b84a
Remove deprecated monggodb_database state 
All functions in the mongobd_database state was deprecated and marked for
removal in the Fluorine release. Since no functions would remain in the state,
the state has been removed.
 2018-03-13 13:49:20 -04:00
rallytime
2e3bc07cf2
Remove deprecated mongodb_user state 
All functions in the mongobd_user state were deprecated and marked for removal
in the Fluorine release. Since no functions would remain in the state, the
state has been removed.
 2018-03-13 13:43:10 -04:00
rallytime
782a5584f5
Update man pages for 2017.7.5 2018-03-13 12:47:40 -04:00
Herbert Buurman
6755e2a567
Add behaviour change of global and state-level failhard to Fluorine release notes. 2018-03-13 17:43:11 +01:00
Gareth J. Greenaway
f721218166
Claryfing the documentation for the new require_any requisite. 2018-03-13 09:28:14 -07:00
Herbert
fae1feba52
Merge branch 'develop' into allow_failhard_override 2018-03-13 17:25:57 +01:00
rallytime
aa760334a1
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-13 10:58:28 -04:00
rallytime
cf44199305
Remove deprecated k8s state 
All functions in the k8s state were deprecated and marked for removal in the
Fluorine release. Since now functions would remain in the state, the state
has been removed.

Fixes #46476
 2018-03-12 17:22:04 -04:00
rallytime
05939e5445
Remove deprecated syntax for "profile" in vault pillar 
Fixes #46475
 2018-03-12 17:12:57 -04:00
Nicole Thomas
b3c8537f93
Merge pull request #46495 from rallytime/fix-46474 
Remove deprecated syntax for roster_order in roster/cache.py
 2018-03-12 16:27:53 -04:00
Nicole Thomas
7cdb00ca9c
Merge pull request #46398 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-03-12 16:25:18 -04:00
rallytime
194c9c12e9
Remove deprecated syntax for roster_order in roster/cache.py 
Fixes #46474
 2018-03-12 13:23:31 -04:00
rallytime
651dcaff66
Merge branch '2018.3' into 'develop' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-03-12 11:53:21 -04:00
nicholasmhughes
f82367289e
added the ability to send salt keys to the userdata script 2018-03-12 09:11:37 -04:00
denza
f1a3d3d8e7 Reserve one or more public IPs 2018-03-11 07:42:54 +01:00
denza
f62aab3bbb Allow a customer to set public and private IP addresses 2018-03-10 09:31:43 +01:00
Nicole Thomas
c7f95581e3
Merge pull request #46449 from bdrung/make-doc-theme-configurable 
Make documentation theme configurable
 2018-03-09 12:47:14 -05:00
Nicole Thomas
bd6eafa22a
Merge pull request #46458 from brejoc/patch-3 
Fixed typo
 2018-03-09 09:30:01 -05:00
Nicole Thomas
33e9630cea
Merge pull request #46460 from ryanwalder/fix-mine-doc 
[Docs] Clarify `mine_interval` setting location in mine docs
 2018-03-09 09:28:24 -05:00
Jochen Breuer
58836993dd
Fixed typo 
I think this should be whether instead of wither.
 2018-03-09 10:03:50 +01:00
David Boucha
ff81291d0b fix typo 2018-03-08 15:34:43 -07:00
David Boucha
250086ae2a Add minion startup event change to release notes 2018-03-08 15:34:43 -07:00
David Boucha
391be5c06c Add docs for turning off extra startup msgs 2018-03-08 15:34:43 -07:00
David Boucha
27c3214461 Use new style event tags 2018-03-08 15:34:43 -07:00
Nicole Thomas
a188984cd9
Merge pull request #46446 from bdrung/fix-typos 
Fix various typos
 2018-03-08 16:11:46 -05:00
Gareth J. Greenaway
4b9d07ef0d
Adding a note about the default box_type change for nacl module and runner to the releaes notes 2018-03-08 13:09:55 -08:00
Benjamin Drung
3d37eca847 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 19:14:42 +01:00
Gareth J. Greenaway
4ae2861d68
Fixing a few bugs introducted following the move to unicode all the things. Adding deprecation notices for the previously used key and key_file arguments. Adding deprecation into Release notes. Adding some tests for Naccl module and runner to test encryption and decryption. 2018-03-08 10:06:55 -08:00
Ryan Walder
b9c9d2d747 Clarify mine_interval setting location in min docs 
Needs clarification pointing direct to the minion config as it follows
config that can be in wither pillar or config which can be confusing.

Especially to me :D
 2018-03-08 16:30:36 +00:00
Benjamin Drung
4a5da2d144 Make documentation theme configurable 
Debian uses the previous documentation theme. Make the documentation
theme configurable via an environment variable HTML_THEME.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 16:56:12 +01:00
Herbert Buurman
d7a939d3ad
Made state-level failhard override global failhard. Update documentation for failhard and onfail-requisites. 2018-03-08 16:42:55 +01:00
Nicole Thomas
c5aa1ca47b
Merge pull request #46393 from gtmanfred/vault 
make vault like all other sdb backends
 2018-03-08 09:28:54 -05:00
Benjamin Drung
a3c54b50f6 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 15:25:42 +01:00
Benjamin Drung
584b451fd1 Support dynamic pillar_root environment 
Allow users to specify a __env__ pillar_root directory that applies
equally to all environments that are not explicitly specified.

fixes #20581
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 10:12:40 +01:00
denza
6bfdc0f0dc Support for a volume password 2018-03-08 05:50:17 +01:00
rallytime
ddbeef85cd
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/payload.py
  - salt/utils/schedule.py
 2018-03-06 16:57:33 -05:00
rallytime
d83727fdf9
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/cli/api.py
  - salt/client/ssh/wrapper/state.py
  - salt/config/__init__.py
  - salt/crypt.py
  - salt/daemons/masterapi.py
  - salt/key.py
  - salt/loader.py
  - salt/master.py
  - salt/modules/archive.py
  - salt/modules/hipchat.py
  - salt/modules/pip.py
  - salt/modules/state.py
  - salt/modules/virt.py
  - salt/modules/x509.py
  - salt/state.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/__init__.py
  - salt/utils/event.py
  - salt/utils/extmods.py
  - salt/utils/files.py
  - salt/utils/parsers.py
  - salt/utils/verify.py
  - tests/integration/shell/test_call.py
  - tests/unit/utils/test_args.py
 2018-03-06 13:45:59 -05:00
Daniel Wallace
0511c4c10c
make vault like all other sdb backends 2018-03-06 10:08:41 -07:00
Ch3LL
158add6661
change oxdownload to oxdownload-{python_version} 2018-03-06 11:12:42 -05:00
Ch3LL
21aa848c89
Add mac py2 and py3 packages to mac installation docs 2018-03-06 11:09:33 -05:00
sumeetisp
c9127712d2
Change in profile parameter as per code 
In the code, del_all_vols_on_destroy is used and in documentation del_all_vol_on_destroy has been used. Hence there is a mismatch.
 2018-03-06 13:15:46 +05:30
Daniel Wallace
ac4133f432
Add getting started openstack doc 2018-03-05 16:25:08 -07:00
Daniel Wallace
5eff6f73e4
Add notes about the openstack revamp 
Also note that the old openstack modules are being deprecated.
 2018-03-05 16:04:59 -07:00
Erik Johnson
0411845cec
Update the merge-forward docs to reference the 2018.3 branch 
This will make the docs for 2018.3.x more coherent once the docs for
2018.3 are pushed live.
 2018-03-05 10:04:30 -06:00
Erik Johnson
61ab47ee70
Merge branch '2017.7' into merge-2017.7-2018.3 
Conflicts:
- salt/cloud/clouds/openstack.py
- salt/daemons/masterapi.py
- salt/master.py
- salt/modules/gentoo_service.py
- salt/pillar/__init__.py
- salt/pillar/git_pillar.py
- salt/runners/cache.py
- salt/runners/git_pillar.py
- salt/runners/winrepo.py
- salt/utils/docker/__init__.py
- salt/utils/gitfs.py
 2018-03-02 16:20:20 -06:00
Nicole Thomas
5f88d64dc0
Merge pull request #46186 from nicholasmhughes/add-additional-azurearm-modules 
Add Additional Azure ARM Modules
 2018-03-02 16:49:07 -05:00
Nicole Thomas
d1d966abc7
Merge pull request #46302 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-03-02 16:27:45 -05:00
Ch3LL
52a68450ae
Update releasecandidate doc for 2018.3.0rc1 2018-03-02 12:02:21 -05:00
rallytime
ed46ce3c74
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/auth/ldap.py
  - salt/modules/zfs.py
  - salt/modules/zpool.py
  - salt/states/cmd.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
  - tests/integration/scheduler/test_postpone.py
  - tests/unit/grains/test_core.py
 2018-03-02 11:55:06 -05:00
rallytime
18eca3da3b
Port 2018.3.0.rst release note changes to develop 2018-03-01 14:24:10 -05:00
Nicole Thomas
8e8a3a2897
Merge pull request #46261 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2018-03-01 12:55:22 -05:00
Nicole Thomas
509429f08c
Merge pull request #46260 from terminalmage/git_pillar 
Normalize global git_pillar/winrepo config items
 2018-02-28 17:05:25 -05:00
rallytime
8256ae5ee5
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2018-02-28 14:59:01 -05:00
Nicole Thomas
1bb4ef6bc8
Merge branch 'develop' into add-additional-azurearm-modules 2018-02-28 14:13:39 -05:00
Erik Johnson
b1ce2501fd
Normalize global git_pillar/winrepo config items 
We were only normalizing the global version of a config parameter if it
had a per-remote counterpart. This was all well and good for gitfs,
which doesn't have any config values that are global-only, but
git_pillar and winrepo have config params which are global-only, and
they were therefore not being normalized.

This fixes that oversight, and also makes a few other changes in
salt.utils.gitfs to ensure that we're not pulling from the un-normalized
values from the opts dict, when we need to fall back to global defaults.

Additionally, it fixes an issue in which the `git_pillar_branch` config
item was overriding the branch set in a git_pillar remote.
 2018-02-28 13:07:11 -06:00
rallytime
f5fae3dedf
Update enterprise banner 
(removes 5.0 text)
 2018-02-28 11:55:16 -05:00
rallytime
07ed8c7db3
Update docbanner for SaltConf18 2018-02-28 11:42:43 -05:00
rallytime
7243baf2c0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/topics/orchestrate/orchestrate_runner.rst
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/pillar/ec2_pillar.py
  - salt/runner.py
  - salt/utils/ssh.py
  - tests/integration/modules/test_cp.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_file.py
  - tests/unit/modules/test_git.py
 2018-02-27 17:13:28 -05:00
Denys Havrysh
d702846961
[DOC] Replace note rST block for GitHub 2018-02-27 16:53:39 +02:00
rallytime
6927642321
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/modules/cmdmod.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-02-26 14:23:06 -05:00
Ch3LL
6ddf3246ce
Add 2017.7.5 Release Notes File 2018-02-26 14:22:20 -05:00
Megan Wilhite
c8c71e75ca
Merge pull request #46133 from rallytime/2017.7_update_version_doc 
Update release versions for the 2017.7 branch
 2018-02-26 11:42:42 -05:00
Megan Wilhite
78671738ff
Merge pull request #46134 from rallytime/develop_update_version_doc 
Update release versions for the develop branch
 2018-02-26 11:42:32 -05:00
rallytime
776f2ea5d7
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - salt/pillar/file_tree.py
  - tests/unit/modules/test_yumpkg.py
 2018-02-26 11:01:42 -05:00
Nicole Thomas
f9408cec52
Merge pull request #46102 from mephi42/develop 
Allow configuring HTTP connect timeout
 2018-02-26 10:15:06 -05:00
nicholasmhughes
2f984d7260
updated required azure module versions 2018-02-25 12:42:40 -05:00
mephi42
46996178e2
Allow configuring HTTP connect timeout 2018-02-24 13:21:26 +01:00
Nicole Thomas
8aaac011b4
Merge pull request #45905 from jasperla/pf 
add execution module for OpenBSD Packet Filter
 2018-02-23 14:28:17 -05:00
Nicole Thomas
606d70c521
Merge pull request #45945 from xyoun/develop 
pip.list_all_versions now can read index_url
 2018-02-23 14:23:48 -05:00
Nicole Thomas
705caa8cca
Merge pull request #46148 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.3 to 2017.7
 2018-02-23 14:21:38 -05:00
rallytime
a731047e59
Add man pages for oxygen release 2018-02-23 12:15:13 -05:00
rallytime
79bed6cff1
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/reg.py
  - salt/modules/win_lgpo.py
  - salt/modules/win_path.py
  - salt/modules/win_pkg.py
  - salt/pillar/file_tree.py
  - salt/states/boto3_route53.py
  - salt/states/reg.py
  - salt/utils/win_functions.py
  - tests/unit/modules/test_kubernetes.py
  - tests/unit/modules/test_win_path.py
 2018-02-23 09:50:19 -05:00
Nicole Thomas
e6374bf68d
Merge pull request #46149 from rallytime/bp-46145 
Back-port #46145 to oxygen.rc1
 2018-02-22 16:57:51 -05:00
Jasper Lievisse Adriaanse
a973b70d64
add execution module for OpenBSD Packet Filter 2018-02-22 21:08:35 +01:00
Erik Johnson
6a8b1ac33a
Document behavior when orchestration runnner invoked with non-orch states 
This also replaces some += usage with list.extend for a modest
performance/memory improvement.
 2018-02-22 10:49:39 -05:00
rallytime
25deebf7a6
Merge branch '2017.7.3' into '2017.7' 
Conflicts:
  - salt/modules/git.py
 2018-02-22 10:22:22 -05:00
Erik Johnson
c77341b544
Rename release notes file to 2018.3.0.rst, add 2018.3.* to release tree 2018-02-21 21:56:54 -06:00
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0 2018-02-21 21:47:41 -06:00
Erik Johnson
f9301fcc34
Document behavior when orchestration runnner invoked with non-orch states 
This also replaces some += usage with list.extend for a modest
performance/memory improvement.
 2018-02-21 20:36:30 -06:00
Denys Havrysh
d8fb051e44
[DOC] Fix code-blocks for reStructuredText 2018-02-21 15:37:57 +02:00
rallytime
6875e9bee8
Update release versions for the develop branch 2018-02-21 06:37:26 -05:00
rallytime
0ed338e643
Update release versions for the 2017.7 branch 2018-02-21 06:37:22 -05:00
rallytime
d2196b6df3
Update release versions for the 2016.11 branch 2018-02-21 06:37:18 -05:00
rallytime
4c2f504a85
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2018-02-20 17:43:33 -05:00
Erik Johnson
8ce0f29842
Add rst file for new module 2018-02-20 10:21:29 -06:00
Denys Havrysh
2062fd0e5c
[DOC] Put https link to the formulas doc page 2018-02-19 12:59:00 +02:00
Wedge Jarrad
5a0fe104f7 Fix contributing doc typo 2018-02-18 10:57:28 -08:00
xyoun
50f26f767e
Merge branch 'develop' into develop 2018-02-18 00:39:31 +08:00
Ch3LL
8d0eeeb059
Update 2017.7.4 Release Notes with new fixes 2018-02-16 11:45:49 -05:00
Ch3LL
2a5d855d97
add required arg to dns_check jinja doc example 2018-02-16 10:48:57 -05:00
tjgruber
c56b60a1ec
Broken Fedora cloud image link fixed 
http://fedoraproject.org/en/get-fedora#clouds
is broken. 
New url is: https://alt.fedoraproject.org/cloud/
 2018-02-15 20:27:01 -08:00
Nicole Thomas
ece4452953
Merge pull request #45078 from aphor/macports 
update macports doc, portfile
 2018-02-15 14:17:33 -05:00
rallytime
e060a74fd8
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/cloud/clouds/dimensiondata.py
  - salt/config/__init__.py
  - salt/modules/yumpkg.py
  - salt/pillar/ec2_pillar.py
  - salt/utils/docker/__init__.py
  - salt/utils/vault.py
  - tests/integration/states/test_docker_container.py
  - tests/unit/modules/test_yumpkg.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/utils/test_docker.py
 2018-02-14 16:31:31 -05:00
rallytime
a06645ce71
Merge branch '2017.7.3' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.4.rst
  - salt/utils/vault.py
 2018-02-13 13:34:24 -05:00
Ch3LL
ac0baf4b34
Add 2017.7.4 Release Notes with PRs 2018-02-13 11:31:20 -05:00
rallytime
d6c2d0693a
Merge branch 'oxygen.rc1' into 'oxygen' 
No conflicts.
 2018-02-13 10:54:25 -05:00
Nicole Thomas
069f790b3c
Merge pull request #45944 from cloudflare/netbox-autodoc 
Add NetBox module autodoc
 2018-02-12 19:01:47 -05:00
twangboy
6d223cffa7
Add tip about passing bogus saltenv 2018-02-12 14:03:31 -07:00
twangboy
87dc554dc3
Add final updates to docs 2018-02-12 14:03:30 -07:00
twangboy
3646d5c897
Fix some docs formatting, add some warnings 2018-02-12 14:03:30 -07:00
rjc
c758ed9132
Simplify firewall rules 
As with `firewall-cmd`, use a single rule for ports in both, the `iptables` and `pf` examples. BTW, there's no need for `-m mport` or `-m multiport` (and these might not even be available if not compiled) for `iptables` or using a list or a macro in `pf.conf` if a contiguous range is being used - essentially, use colon ('`:`') for simplicity and consistency.
 2018-02-10 06:28:30 +00:00
xy@zhihu.com
be8427fdc9 pip.list_all_versions now can read index_url 2018-02-09 17:46:32 +08:00
Mircea Ulinic
ed69b987cf Add NetBox module autodoc 2018-02-09 09:45:40 +00:00
rallytime
255cc7ffb0
Merge branch 'oxygen' into 'develop' 
No conflicts.
 2018-02-08 11:24:56 -05:00
rallytime
d80547e0b8
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/fileclient.py
  - salt/grains/disks.py
  - salt/modules/cmdmod.py
  - salt/state.py
  - salt/states/file.py
  - salt/utils/gitfs.py
  - salt/utils/win_functions.py
  - tests/integration/modules/test_state.py
  - tests/unit/cache/test_localfs.py
 2018-02-08 11:23:31 -05:00
rallytime
e4e4744218
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2018-02-08 10:42:37 -05:00
Nicole Thomas
3a3f87c16d
Merge pull request #45877 from rallytime/new-release-notes 
Add release notes file for 2017.7.4 release
 2018-02-08 09:07:42 -05:00
Erik Johnson
b4e24a69e6
Move get_context to salt.utils.stringutils 
This avoids circular dependencies when salt.utils.jinja (which is
imported by salt.utils.templates) needs to use get_context()
 2018-02-07 02:09:56 -06:00
rallytime
f937e8ba81
Add release notes file for 2017.7.4 release 2018-02-06 09:57:22 -05:00
Nicole Thomas
27ff82f996
Merge pull request #45864 from rallytime/release-note-fix 
Remove extraneous ] in release notes for 2016.11.9
 2018-02-06 09:31:09 -05:00
rallytime
104a24f244
Remove extraneous ] in release notes for 2016.11.9 2018-02-05 16:34:19 -05:00
Nicole Thomas
44e24174de
Merge pull request #45803 from rallytime/develop_docs 
[develop] Bump latest and previous versions
 2018-02-05 10:31:04 -05:00
Nicole Thomas
cca997d0da
Merge pull request #45788 from rallytime/2017.7.3_docs 
[2017.7] Bump latest and previous versions
 2018-02-05 10:30:46 -05:00
Jasper Lievisse Adriaanse
9f50ee6049
Mention nodegroups in the list of compound matchers 2018-02-02 18:05:01 +01:00
Erik Johnson
2feaaa3efc
Fix invalid Sphinx lexers in docs 
This clears up some warnings when we build the docs, and improves the
syntax highlighting in the docs.
 2018-02-02 09:21:07 -06:00
Benjamin Drung
179e8fbe73 doc: Do not mock non-existing __qualname__ attribute 
Building the documentation with the Python 3 version of sphinx fails:

$ make -C doc html SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build
[...]
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/sphinx/cmdline.py", line 296, in main
    app.build(opts.force_all, filenames)
  File "/usr/lib/python3/dist-packages/sphinx/application.py", line 333, in build
    self.builder.build_update()
  File "/usr/lib/python3/dist-packages/sphinx/builders/__init__.py", line 251, in build_update
    'out of date' % len(to_build))
  File "/usr/lib/python3/dist-packages/sphinx/builders/__init__.py", line 265, in build
    self.doctreedir, self.app))
  File "/usr/lib/python3/dist-packages/sphinx/environment/__init__.py", line 556, in update
    self._read_serial(docnames, app)
  File "/usr/lib/python3/dist-packages/sphinx/environment/__init__.py", line 576, in _read_serial
    self.read_doc(docname, app)
  File "/usr/lib/python3/dist-packages/sphinx/environment/__init__.py", line 684, in read_doc
    pub.publish()
  File "/usr/lib/python3/dist-packages/docutils/core.py", line 217, in publish
    self.settings)
  File "/usr/lib/python3/dist-packages/sphinx/io.py", line 55, in read
    self.parse()
  File "/usr/lib/python3/dist-packages/docutils/readers/__init__.py", line 78, in parse
    self.parser.parse(self.input, document)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/__init__.py", line 191, in parse
    self.statemachine.run(inputlines, document, inliner=self.inliner)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 172, in run
    input_source=document['source'])
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 239, in run
    context, state, transitions)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 460, in check_line
    return method(match, context, next_state)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2989, in text
    self.section(title.lstrip(), source, style, lineno + 1, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 328, in section
    self.new_subsection(title, lineno, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 396, in new_subsection
    node=section_node, match_titles=True)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 283, in nested_parse
    node=node, match_titles=match_titles)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 197, in run
    results = StateMachineWS.run(self, input_lines, input_offset)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 239, in run
    context, state, transitions)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 460, in check_line
    return method(match, context, next_state)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2754, in underline
    self.section(title, source, style, lineno - 1, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 328, in section
    self.new_subsection(title, lineno, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 396, in new_subsection
    node=section_node, match_titles=True)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 283, in nested_parse
    node=node, match_titles=match_titles)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 197, in run
    results = StateMachineWS.run(self, input_lines, input_offset)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 239, in run
    context, state, transitions)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 460, in check_line
    return method(match, context, next_state)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2754, in underline
    self.section(title, source, style, lineno - 1, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 328, in section
    self.new_subsection(title, lineno, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 396, in new_subsection
    node=section_node, match_titles=True)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 283, in nested_parse
    node=node, match_titles=match_titles)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 197, in run
    results = StateMachineWS.run(self, input_lines, input_offset)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 239, in run
    context, state, transitions)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 460, in check_line
    return method(match, context, next_state)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2327, in explicit_markup
    nodelist, blank_finish = self.explicit_construct(match)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2339, in explicit_construct
    return method(self, expmatch)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2082, in directive
    directive_class, match, type_name, option_presets)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2131, in run_directive
    result = directive_instance.run()
  File "/usr/lib/python3/dist-packages/sphinx/ext/autodoc.py", line 1668, in run
    documenter.generate(more_content=self.content)
  File "/usr/lib/python3/dist-packages/sphinx/ext/autodoc.py", line 1013, in generate
    self.document_members(all_members)
  File "/usr/lib/python3/dist-packages/sphinx/ext/autodoc.py", line 1388, in document_members
    ModuleLevelDocumenter.document_members(self, all_members)
  File "/usr/lib/python3/dist-packages/sphinx/ext/autodoc.py", line 903, in document_members
    for (mname, member, isattr) in self.filter_members(members, want_all):
  File "/usr/lib/python3/dist-packages/sphinx/ext/autodoc.py", line 871, in filter_members
    not keep, self.options)
  File "/usr/lib/python3/dist-packages/sphinx/application.py", line 593, in emit_firstresult
    for result in self.emit(event, *args):
  File "/usr/lib/python3/dist-packages/sphinx/application.py", line 589, in emit
    results.append(callback(self, *args))
  File "/usr/lib/python3/dist-packages/sphinx/ext/napoleon/__init__.py", line 426, in _skip_member
    cls_path, _, _ = qualname.rpartition('.')
ValueError: not enough values to unpack (expected 3, got 0)

The napoleon sphinx extensions queries the attribute __qualname__ of the
given obj and expect a string as result. It uses a default value if this
attribute does not exist. The real Python modules do not have a
__qualname__ attribute, but the doc.conf.Mock object returns a Mock
object when queried for the __qualname__ attribute. Change the Mock
object to raise an AttributeError instead. This fixes #45684.
 2018-02-01 19:23:53 +01:00
rallytime
6f3e966086
[develop] Bump latest and previous versions 2018-01-31 10:51:00 -05:00
rallytime
d5faf6126b
[2017.7] Bump latest and previous versions 2018-01-30 15:39:10 -05:00
rallytime
a38d4d44fa
[2016.11] Bump latest and previous versions 2018-01-30 15:35:55 -05:00
Nurono
dd5fa715f8 Fix an inconsistency in the docs 
``salt.runners.fileserver`` has no function ``clear_list_cache``
Its name should be ``clear_file_list_cache`` instead.
 2018-01-30 14:44:14 +03:00
rallytime
502f031f60
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - salt/utils/cloud.py
 2018-01-29 09:37:19 -05:00
rallytime
ce3902b158
Merge branch '2017.7' into merge-oxygen 2018-01-28 08:51:03 -05:00
rallytime
0ad101d560
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - doc/man/salt.7
  - salt/modules/git.py
  - salt/modules/pacman.py
  - salt/states/git.py
  - tests/integration/modules/test_mac_user.py
  - tests/support/parser/__init__.py
 2018-01-26 17:27:03 -05:00
Elias Probst
bec78276f3
Replace left-over mistyped codename reference (Hellium → 2014.7.0) 2018-01-26 22:52:10 +01:00
rallytime
cbf1ed2f97
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/modules/cmdmod.py
 2018-01-26 16:28:01 -05:00
Nicole Thomas
6b4950857c
Merge pull request #45187 from nicholasmhughes/add-azurearm-govcloud-support 
Azure (ARM): Fix GovCloud Support
 2018-01-26 11:35:10 -05:00
rallytime
f10c7ee92d
Merge branch '2017.7.3' into '2017.7' 
No conflicts.
 2018-01-26 09:59:21 -05:00
Ch3LL
84c8216901
Add PRs to 2017.7.3 Release Notes 2018-01-25 15:51:34 -05:00
nicholasmhughes
2d66c773ca
two linux profile examples, one with key and one with password 2018-01-25 13:03:06 -05:00
Dmitry Kuzmenko
99a0e1f7e2
Added M2Crytpo release note. 2018-01-25 20:32:00 +03:00
Dmitry Kuzmenko
a67fe51a5c
Fixed some tests, updated a doc. 2018-01-25 20:31:59 +03:00
rallytime
b5fb80e8c3
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - salt/utils/saltclass.py
 2018-01-25 11:21:31 -05:00
rallytime
d4dac9f7cc
Merge branch '2016.11' into '2017.7' 
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
 2018-01-25 10:42:14 -05:00
Nicole Thomas
b2390e69ca
Merge pull request #45505 from DSRCorporation/bugs/raet_deprecation 
Deprecate RAET
 2018-01-25 10:05:02 -05:00
Damon Atkins
1d21f86228
Update 2017.7.3.rst 2018-01-25 19:37:32 +11:00
Nicole Thomas
3a6837e232
Merge pull request #45675 from Ch3LL/rn_2016.11.9 
Add new commits to 2016.11.9 release notes
 2018-01-24 17:29:33 -05:00
Ch3LL
7b5bed36d9
Add new commits to 2016.11.9 release notes 2018-01-24 16:16:52 -05:00
rallytime
9f78e53d4b
Merge branch '2017.7.3' into '2017.7' 
No conflicts.
 2018-01-24 16:09:17 -05:00
Dmitry Kuzmenko
f88bbbe147
Raet deprecation warning and release note. 2018-01-24 22:49:18 +03:00
rallytime
1b4744165b
Add auth error raising change to oxygen release notes 2018-01-24 14:03:35 -05:00
rallytime
d31b41adeb
Update man pages for 2017.7.3 release 2018-01-24 13:46:43 -05:00
Nicole Thomas
e21088c1a4
Merge pull request #45662 from bdrung/2017.7 
Fix documentation generation
 2018-01-24 12:14:22 -05:00
Jasper Lievisse Adriaanse
39ec4c9bfc add salt.modules.vmctl to doc index 2018-01-24 16:49:40 +01:00
Benjamin Drung
71076afbcc doc: Define fake version for msgpack and psutil 
When using Python 3 to generate the documentation, it will fail:

$ make -C doc html SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build
[...]
  File "salt/config/__init__.py", line 84, in _gather_buffer_space
    if HAS_PSUTIL and psutil.version_info >= (0, 6, 0):
TypeError: '>=' not supported between instances of 'Mock' and 'tuple'

Therefore add fake version variables to the mocked msgpack and psutil
module.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-01-24 15:56:18 +01:00
Benjamin Drung
b6a5b745b1 doc: Mock keyring module import 
The salt/sdb/keyring_db.py

Traceback (most recent call last):
  File "salt/sdb/keyring_db.py", line 53, in <module>
    import keyring
  File "/usr/lib/python2.7/dist-packages/keyring/__init__.py", line 6, in <module>
    from .core import (set_keyring, get_keyring, set_password, get_password,
  File "/usr/lib/python2.7/dist-packages/keyring/core.py", line 148, in <module>
    init_backend()
  File "/usr/lib/python2.7/dist-packages/keyring/core.py", line 64, in init_backend
    keyrings = filter(limit, backend.get_all_keyring())
  File "/usr/lib/python2.7/dist-packages/keyring/util/__init__.py", line 20, in wrapper
    func.always_returns = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/keyring/backend.py", line 191, in get_all_keyring
    exceptions=TypeError))
  File "/usr/lib/python2.7/dist-packages/keyring/util/__init__.py", line 29, in suppress_exceptions
    for callable in callables:
  File "/usr/lib/python2.7/dist-packages/keyring/backend.py", line 183, in is_class_viable
    keyring_cls.priority
  File "/usr/lib/python2.7/dist-packages/keyring/util/properties.py", line 22, in __get__
    return self.fget.__get__(None, owner)()
  File "/usr/lib/python2.7/dist-packages/keyring/backends/kwallet.py", line 128, in priority
    return super(DBusKeyringKWallet4, cls).priority - 1
  File "/usr/lib/python2.7/dist-packages/keyring/util/properties.py", line 22, in __get__
    return self.fget.__get__(None, owner)()
  File "/usr/lib/python2.7/dist-packages/keyring/backends/kwallet.py", line 31, in priority
    bus = dbus.SessionBus(mainloop=DBusGMainLoop())
NameError: global name 'DBusGMainLoop' is not defined

Therefore also mock the keyring module when generating the
documentation. This fixes #45072.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-01-24 15:56:01 +01:00
Nicole Thomas
9c4c22989f
Merge pull request #45607 from onovy/typos 
Fixed few typos in docs
 2018-01-23 17:34:12 -05:00
ddoh94
e474d0416b
update winrepo_source_dir document 
The winrepo_source_dir minion config can be set with or without a master.  It is currently documented as only available if the minion is running in masterless mode.  I have updated the documentation to reflect that it will work in master or masterless mode.
 2018-01-23 17:25:25 -05:00
rallytime
3c298afa72
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/modules/pip.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/runners/manage.py
  - salt/states/pkg.py
  - salt/transport/zeromq.py
  - salt/utils/event.py
  - tests/integration/modules/test_pip.py
  - tests/integration/states/test_user.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_archive.py
  - tests/unit/utils/test_boto.py
 2018-01-23 13:26:43 -05:00
rallytime
af696989c8
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - doc/topics/releases/oxygen.rst
 2018-01-22 12:35:29 -05:00
Ondřej Nový
137f4c21fd Fixed few typos in docs 2018-01-22 17:14:57 +01:00
Denys Havrysh
35675fe6b3
[DOC] Fix references on Salt Formulas page 2018-01-22 11:16:39 +02:00
Nicole Thomas
0d622f92a9
Merge pull request #45542 from UtahDave/doc_mixed_transports 
Add warning about using mixed transports
 2018-01-19 16:44:30 -05:00
Nicole Thomas
c70b9dc20b
Merge pull request #45565 from Ch3LL/r-notes-2016 
Add PR changes to 2016.11.9 Release Notes
 2018-01-19 16:36:12 -05:00
Nicole Thomas
2d1dd1186e
Merge pull request #45564 from Ch3LL/r-notes-2016 
Add PR changes to 2016.11.9 Release Notes
 2018-01-19 16:36:05 -05:00
Ch3LL
325f4cbcda
Add PR changes to 2016.11.9 Release Notes 2018-01-19 16:32:46 -05:00