valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,479 Commits 24 Branches 182 Tags 341 MiB
cf508a4a50
Commit Graph

8423 Commits

Author SHA1 Message Date
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
rallytime
f9be1b9125
Update release versions for the 2018.3 branch 2018-06-13 09:47:16 -04:00
rallytime
9a0f4d190a
Update release versions for the 2017.7 branch 2018-06-13 09:47:12 -04:00
Erik Johnson
24545204b3
Fix inaccurate gitfs_saltenv example in GitFS Walkthrough 2018-06-12 09:25:53 -05:00
Erik Johnson
20f71ff6f6
Fix link without target in 2018.3.0 release notes 2018-06-11 12:01:34 -05:00
Erik Johnson
e4d67c5fd8
Update docs to include references to new "sync" argument 2018-06-08 12:29:19 -05:00
Erik Johnson
8289b07e24
Fix documentation on when custom types are synced 2018-06-08 09:33:35 -05:00
Ch3LL
01e8c59296
remove duplicate changelog line 2018-06-06 14:08:35 -04:00
Ch3LL
5b8534cfb3
Update 2018.3.1 release notes with new fixes 2018-06-06 14:07:11 -04:00
Erik Johnson
f89d2ccd30
Clean up Sphinx warnings 2018-06-06 08:42:21 -05:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
Erik Johnson
af51e16f23
Use more elegant RST syntax 2018-05-31 15:28:25 -05:00
Erik Johnson
d37f7e4f04
Add 2017.7.6 release notes 2018-05-31 15:28:25 -05:00
Erik Johnson
9dddeeefab
Improve documentation on syncing states 2018-05-31 15:28:25 -05:00
Erik Johnson
f465fa3ca7
Add best practices docs for writing states 2018-05-31 15:28:25 -05:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
Erik Johnson
64b9b4d0b8
Clarify that name would override the id declaration 2018-05-31 15:28:24 -05:00
Nicole Thomas
0d229c6182
Merge branch '2018.3' into fix_47559 2018-05-31 11:28:30 -04:00
twangboy
9e612ec9e7
Fix markup in release notes 2018-05-30 16:10:26 -06:00
Nicole Thomas
b4bac9b41b
Merge pull request #47868 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-30 17:20:37 -04:00
Ch3LL
f560a151cd
Remove In Progress for 2018.3.1 Release Notes 2018-05-30 14:14:55 -04:00
rallytime
2801eecb26
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-30 11:14:40 -04:00
Ch3LL
e27ee273a7
Add == line to changelog line for release notes 2018-05-30 10:51:12 -04:00
Ch3LL
61e56d275d
Add changelog to 2018.3.1 release notes 2018-05-30 10:49:30 -04:00
rallytime
58dee4c829
Remove sentence about the release being in progress 2018-05-29 16:27:43 -04:00
rallytime
b3dcb7330e
Remove "in progress" too 2018-05-29 16:26:28 -04:00
rallytime
99e1df7823
Update 2017.7.6 release notes: remove "unreleased" text 
In preparation for the 2017.7.6 release, remove the "unreleased" text
from the release notes.
 2018-05-29 15:31:51 -04:00
Daniel Wallace
13f920415a
add tornado5 note to 2018.3.1 2018-05-29 14:01:54 -05:00
Daniel Wallace
aeacd2b749
allow tornado 5.0 to be installed only for python2 2018-05-29 14:01:18 -05:00
Daniel Wallace
a1c1b5b5cf
allow tornado 5.0 to be installed only for python2 2018-05-29 13:57:54 -05:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/win_snmp.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_pkg.py
  - tests/support/helpers.py
  - tests/support/runtests.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/whitelist.txt
 2018-05-29 11:14:39 -04:00
Daniel Wallace
c4d828c986
Merge pull request #47850 from rallytime/swarm-autodoc 
Fix autodoc for new swarm module
 2018-05-25 20:53:16 -05:00
rallytime
467c8fa45c Fix autodoc for new swarm module 
A misspelling of "members" was causing the docs for the swarm module to
not build.

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

The docs should be building for the swarm execution module with the
appropriate doc and CLI example formatting.
 2018-05-25 21:07:51 -04:00
Nicole Thomas
cffc9b7806
Merge branch '2017.7' into fix_46981 2018-05-24 12:52:59 -04:00
twangboy
5656183c5e
Add timezone.list, add 2018.3.2 release notes 2018-05-23 14:18:30 -06:00
twangboy
81308a4a44
Add release notes for 2017.7.7 2018-05-23 13:47:08 -06:00
rallytime
4abfd26e86
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
  - salt/fileclient.py
  - salt/output/__init__.py
  - salt/serializers/configparser.py
  - salt/states/pkg.py
  - salt/states/zpool.py
  - salt/transport/tcp.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_mac_user.py
  - tests/integration/modules/test_pip.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/modules/test_service.py
  - tests/integration/states/test_pip_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_cmdmod.py
 2018-05-23 12:33:00 -04:00
Nicole Thomas
0e87559ee3
Merge pull request #47781 from rallytime/update-linode-sizes 
Update cloud test profile and docs to use new Linode size lables
 2018-05-23 09:09:12 -04:00
rallytime
1adb8ea27f
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-22 17:14:31 -04:00
rallytime
a90c1b760e
Update cloud test profile and docs to use new Linode size lables 
Linode changed their size labels recently, so the cloud test profile
and the docs need to be updated accordingly.

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

For example, the `Linode 2048` size is now `Linode 2GB`.
 2018-05-22 16:00:39 -04:00
rallytime
e458f4a031
Merge branch '2017.7.6' into '2017.7' 
No conflicts.
 2018-05-21 10:34:10 -04:00
Ch3LL
d4aa83b92d
Add changelog to 2017.7.6 release notes 2018-05-21 10:01:00 -04:00
Gareth J. Greenaway
5d23ef4dd8
Updating Beacon topic to include list based configuration for Beacons 2018-05-19 16:29:27 -07:00
Nicole Thomas
9f926bcd1a
Merge pull request #47541 from gtmanfred/2018.3 
switch skip-roster to update-roster
 2018-05-18 09:29:49 -04:00
Nicole Thomas
cb04d9c37e
Merge pull request #47661 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-16 11:53:35 -04:00
rallytime
dd3e6f3f0a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/states/pkgrepo.py
 2018-05-15 12:29:29 -04:00
Nicole Thomas
3ffa412ee5
Merge branch '2018.3' into 2018.3-salt-ssh-pillar-propagation-issue-47501 2018-05-15 11:15:02 -04:00
rallytime
2827c56399
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-14 10:57:50 -04:00
rallytime
1503f1020f
Merge branch '2017.7.6' into '2017.7' 
No conflicts.
 2018-05-14 10:56:21 -04:00
Mike Place
6d2ddd050f
One more grammar fixup 2018-05-11 11:32:33 -05:00
Mike Place
2d5ff01261
Grammar fix 2018-05-11 09:18:55 -05:00
Ch3LL
138847c9c4
Update debian install docs to reflect new latest debian releases 2018-05-11 09:51:50 -04:00
Nicole Thomas
4ec63dd041
Merge pull request #47589 from Ch3LL/watch_any_doc 
Remove duplicate file id in watch_any doc example
 2018-05-10 18:05:59 -04:00
Nicole Thomas
9836a7e62b
Merge pull request #47564 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-10 15:13:35 -04:00
Ch3LL
8cb97a48f5
Add additional state to watch_any doc example 2018-05-10 14:34:44 -04:00
Ch3LL
f7223a3bbf
Remove duplicate file id in watch_any doc example 2018-05-10 09:30:03 -04:00
rallytime
ca927fc14b
Add extra lines that are needed for proper code-block formatting 2018-05-09 16:10:31 -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
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
Matei Albu
2f1485e067 Option to merge current pillar with opts['pillar'] during pillar compile 
Fixes #47501
 2018-05-08 17:42:40 +02: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
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
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
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
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
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
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
3b40cdad2a
Add 2018.3.1 Release Notes 2018-04-30 09:35:46 -04: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
Mike Place
33c0644ac4
Credit Frank Spierings 2018-04-26 11:29:51 -05: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
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
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
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
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
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
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
Cory Wright
bd0918fc40
Add auth.file module to auth documentation page 2018-04-11 11:40:00 -04:00
Denys Havrysh
bfdf54e61d
[DOC] Fix Jinja block in FAQ page 
Closes #18835
 2018-04-08 12:19:48 +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
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
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
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
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
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
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
rallytime
e8864b7b0b
Merge branch '2017.7' into '2018.3' 2018-03-28 13:52:28 -04:00
Denys Havrysh
a1cc55da3d
[DOC] Remove mentions of COPR repo from RHEL installation page 
Fixes #28142
 2018-03-28 12:30:07 +03: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
5336e866ac
Update release versions for the 2017.7 branch 2018-03-27 14:25:16 -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
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
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
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
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
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
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
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
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
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
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
rallytime
782a5584f5
Update man pages for 2017.7.5 2018-03-13 12:47:40 -04:00
Gareth J. Greenaway
f721218166
Claryfing the documentation for the new require_any requisite. 2018-03-13 09:28:14 -07:00
rallytime
aa760334a1
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-13 10:58:28 -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
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
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
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
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
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
Daniel Wallace
ac4133f432
Add getting started openstack doc 2018-03-05 16:25:08 -07:00