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 |
|
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
|
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
|
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 |
|
rallytime
|
2801eecb26
|
Merge branch '2018.3.1' into '2018.3'
No conflicts.
|
2018-05-30 11:14:40 -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
|
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 |
|
Ch3LL
|
d4aa83b92d
|
Add changelog to 2017.7.6 release notes
|
2018-05-21 10:01:00 -04:00 |
|
Ch3LL
|
b6d0cc2ab7
|
Add In Progress Warning for 2017.7.6 Release Notes
|
2018-05-03 12:06:15 -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 |
|