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
92,820 Commits 24 Branches 182 Tags 341 MiB
20f71ff6f6
Commit Graph

1481 Commits

Author SHA1 Message Date
Erik Johnson
20f71ff6f6
Fix link without target in 2018.3.0 release notes 2018-06-11 12:01:34 -05: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
d37f7e4f04
Add 2017.7.6 release notes 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
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
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
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
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
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
Ch3LL
d4aa83b92d
Add changelog to 2017.7.6 release notes 2018-05-21 10:01:00 -04:00
Daniel Wallace
8c5c780292
switch skip-roster to update-roster 2018-05-09 12:51:53 -05: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
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
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
Mike Place
33c0644ac4
Credit Frank Spierings 2018-04-26 11:29:51 -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
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
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
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
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
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
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
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