Nicole Thomas
67cb5563ef
Merge pull request #48252 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-06-22 11:13:41 -04:00
rallytime
84ec655c24
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/ref/configuration/minion.rst
- salt/minion.py
- salt/modules/dockermod.py
- salt/modules/lxc.py
- salt/utils/__init__.py
- tests/unit/modules/test_mount.py
2018-06-21 14:22:15 -04:00
rallytime
19c104b6cd
Update release notes for 2018.3.2
2018-06-21 13:03:39 -04:00
rallytime
dae65da256
Merge branch '2018.3.1' into '2018.3'
2018-06-19 14:56:06 -04:00
Erik Johnson
44c275698a
Actually it's more than just add/remove that updates the mine
2018-06-17 21:16:09 -05:00
Erik Johnson
0cb6996b07
Add release notes mention of docker.update_mine config option
2018-06-17 21:11:05 -05:00
rallytime
398cc78224
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- .kitchen.yml
- doc/topics/releases/2017.7.6.rst
- salt/modules/timezone.py
- tests/support/case.py
- tests/unit/modules/test_timezone.py
2018-06-15 16:51:45 -04:00
Nicole Thomas
e1e566d1f8
Merge pull request #48135 from rallytime/release-notes-2017.7
...
Update the 2017.7.7 and 2017.7.8 release notes
2018-06-14 17:22:06 -04:00
rallytime
7a97f157b3
Add missing v for tag reference
2018-06-14 12:10:18 -04:00
rallytime
2f2b69ed37
Add "in progress" notation to 2017.7.7 release notes
2018-06-14 12:08:47 -04:00
rallytime
06a1151a63
Add release notes file for 2017.7.7
2018-06-14 12:06:04 -04:00
rallytime
885b2862ce
Move 2017.7.7 release notes to 2017.7.8
2018-06-14 12:05:37 -04:00
rallytime
afe1e91972
Add "in progress" notation to 2018.3.2 release notes
2018-06-14 10:55:44 -04:00
rallytime
3e4272ac09
Add release notes for 2018.3.2
2018-06-14 10:53:40 -04:00
rallytime
88c584cb0d
Move 2018.3.2 release notes to 2018.3.3
2018-06-14 10:53:07 -04:00
rallytime
cdb45874de
Merge branch '2017.7.6' into '2017.7'
...
Conflicts:
- doc/topics/releases/2017.7.6.rst
- requirements/base.txt
2018-06-13 15:04:55 -04:00
rallytime
fad6a0991e
Remove "in progress" info for 2018.3.1 release notes
2018-06-13 09:53:08 -04:00
rallytime
a3b3b0a0e1
Remove "in progress" info for 2017.7.6 release notes
2018-06-13 09:52:12 -04:00
rallytime
1b8d1c936b
Remove "in progress" info for 2017.7.6 release notes
2018-06-13 09:49:47 -04:00
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
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
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
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
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
