Gareth J. Greenaway
|
11cd485a8b
|
Merge branch '2018.3' into merge-2019.2
Conflicts:
- doc/topics/installation/freebsd.rst
|
2019-03-25 13:42:28 -07:00 |
|
Shane Lee
|
582d306164
|
Merge pull request #52307 from Akm0d/doc_fix
Fix x509 inconsistent file name in state example
|
2019-03-25 13:11:14 -06:00 |
|
Akmod
|
4da0fd62d3
|
Fix x509 inconsistent file name in state example
Solves issue: https://github.com/saltstack/salt/issues/52166
|
2019-03-25 11:47:27 -06:00 |
|
Gareth J. Greenaway
|
3ac6dbdd7a
|
Merge pull request #52190 from Ch3LL/merge-2019.2
[2019.2] Merge forward from 2018.3 to 2019.2
|
2019-03-22 18:09:32 -07:00 |
|
Gareth J. Greenaway
|
68c02b9c34
|
Merge branch '2019.2' into merge-2019.2
|
2019-03-22 17:36:18 -07:00 |
|
Shane Lee
|
2cdf48ed67
|
Merge pull request #52276 from terminal-labs/replace-github-dead-link
Replace GitHub dead link
|
2019-03-22 18:28:20 -06:00 |
|
Shane Lee
|
f5fc807c13
|
Merge pull request #52240 from soer7022/patch-2
Fix Typos "swtich" to "switch"
|
2019-03-22 18:08:49 -06:00 |
|
Shane Lee
|
d1308324a3
|
Merge branch '2019.2' into patch-2
|
2019-03-22 18:08:36 -06:00 |
|
Megan Wilhite
|
34d601e902
|
Merge branch '2019.2' into merge-2019.2
|
2019-03-22 16:38:07 -04:00 |
|
Gareth J. Greenaway
|
a2fbbe05e1
|
Merge branch '2018.3' into replace-github-dead-link
|
2019-03-22 11:55:43 -07:00 |
|
Shane Lee
|
8fa0e51336
|
Merge pull request #52290 from Akm0d/doc_fix
Add missing master/minion docs for log_rotate*
|
2019-03-22 12:48:13 -06:00 |
|
Gareth J. Greenaway
|
08728cf660
|
Merge branch '2018.3' into replace-github-dead-link
|
2019-03-22 11:32:15 -07:00 |
|
Akmod
|
ca00e4bf20
|
Merge branch '2018.3' of github.com:saltstack/salt into doc_fix
|
2019-03-22 11:29:54 -06:00 |
|
Akmod
|
8e1ec15c39
|
Add missing master/minion docs for log_rotate*
Adds log_rotate_backup_count and log_rotate_max_bytes to the
minion and master config documentation
Solves issue: #51921
|
2019-03-22 11:26:01 -06:00 |
|
Shane Lee
|
d2fd84fca0
|
Merge pull request #51724 from clinta/docker-create-with-ip
add networking_config to container create fixes #51723
|
2019-03-21 17:06:54 -06:00 |
|
Shane Lee
|
c933663466
|
Merge branch '2018.3' into docker-create-with-ip
|
2019-03-21 15:01:20 -06:00 |
|
Shane Lee
|
838a7aa072
|
Merge pull request #51753 from terminal-labs/docs-sphinx-ref-deadlink-fix
Docs sphinx ref and role terminology dead link replaced
|
2019-03-21 13:38:56 -06:00 |
|
Shane Lee
|
f2b6abd9f2
|
Merge branch '2018.3' into docs-sphinx-ref-deadlink-fix
|
2019-03-21 13:38:41 -06:00 |
|
Shane Lee
|
a4e3e342fb
|
Merge branch '2018.3' into docker-create-with-ip
|
2019-03-21 13:37:30 -06:00 |
|
Gareth J. Greenaway
|
a00245eb6a
|
Merge pull request #52040 from garethgreenaway/52036_rsync_state_no_changes_when_error
[2019.2] Fix to rsync state
|
2019-03-21 12:08:19 -07:00 |
|
Gareth J. Greenaway
|
09d1672648
|
Merge branch '2019.2' into 52036_rsync_state_no_changes_when_error
|
2019-03-21 10:14:14 -07:00 |
|
Gareth J. Greenaway
|
efb9ec0b31
|
Merge pull request #52215 from garethgreenaway/bp-52212
Back-port PR #52212 to 2018.3
|
2019-03-21 10:13:45 -07:00 |
|
Megan Wilhite
|
53878210bd
|
Merge pull request #51962 from Ch3LL/rn_update
Update 2019.2.0 release notes with other tojson example
|
2019-03-21 12:37:43 -04:00 |
|
Megan Wilhite
|
f63bae987d
|
Merge branch '2019.2' into rn_update
|
2019-03-21 11:24:36 -04:00 |
|
Gareth J. Greenaway
|
9857f53280
|
Merge branch '2018.3' into docs-sphinx-ref-deadlink-fix
|
2019-03-21 07:47:18 -07:00 |
|
Clint Armstrong
|
c6e553c2c7
|
add networking_config to container_create for custom network_mode
|
2019-03-21 10:05:57 -04:00 |
|
Clint Armstrong
|
5c99dbdf1a
|
add test to expose ip not added to custom network #51723
|
2019-03-21 10:05:45 -04:00 |
|
Shane Lee
|
65857ef533
|
Merge branch '2018.3' into bp-52212
|
2019-03-20 18:22:03 -06:00 |
|
Gareth J. Greenaway
|
679c4b2824
|
Merge pull request #52269 from garethgreenaway/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
|
2019-03-20 17:06:43 -07:00 |
|
Shane Lee
|
8a11d273ae
|
Merge branch '2018.3' into docs-sphinx-ref-deadlink-fix
|
2019-03-20 17:17:17 -06:00 |
|
Shane Lee
|
3b6fdf8f4f
|
Merge branch '2019.2' into patch-2
|
2019-03-20 17:05:36 -06:00 |
|
Gareth J. Greenaway
|
ee585600d2
|
Merge branch '2018.3' into merge-2018.3
|
2019-03-20 15:34:23 -07:00 |
|
Daniel Wozniak
|
0fe7f28edf
|
Merge pull request #52262 from dwoz/update_kitcen_2019.2
Use windows state to bootstrap windows builds
|
2019-03-20 15:12:24 -07:00 |
|
Daniel Wozniak
|
418e54394d
|
Merge pull request #52261 from dwoz/update_kitchen
Use windows state to bootstrap windows builds
|
2019-03-20 15:12:07 -07:00 |
|
Gareth J. Greenaway
|
1aa1bd8edc
|
Merge branch '2017.7' into merge-2018.3
Conflicts:
- tests/integration/modules/test_shadow.py
|
2019-03-20 14:28:14 -07:00 |
|
Daniel A. Wozniak
|
49d529d2d4
|
Use windows state to bootstrap windows builds
This is also removing the use of dev_*.ps1 scripts in the windows builds
|
2019-03-20 09:27:42 -07:00 |
|
Daniel A. Wozniak
|
a87c6ea54c
|
Use windows state to bootstrap windows builds
This is also removing the use of dev_*.ps1 scripts in the windows builds
|
2019-03-20 09:25:01 -07:00 |
|
Søren Skov Eriksen
|
5db7a3f2df
|
Fix Typos "swtich" to "switch"
|
2019-03-19 13:59:36 +01:00 |
|
Alan Cugler
|
62e54044fc
|
github issue tracker link and sends you to the url for listed issues.
|
2019-03-18 16:18:40 -05:00 |
|
Alan Cugler
|
842ec84186
|
Merge branch '2018.3' into docs-sphinx-ref-deadlink-fix
|
2019-03-18 14:32:32 -05:00 |
|
Pedro Algarvio
|
2962e94de3
|
Lock coverage and xml-unittest-reporting versions
|
2019-03-18 17:51:37 +00:00 |
|
Pedro Algarvio
|
595303b97a
|
Merge remote-tracking branch 'upstream/2017.7.9' into 2017.7
|
2019-03-17 18:32:21 +00:00 |
|
Pedro Algarvio
|
55e150cef9
|
Proper setup and teardown
|
2019-03-17 18:30:44 +00:00 |
|
Pedro Algarvio
|
b9b6009cfa
|
Don't run distro on windows
|
2019-03-17 18:30:44 +00:00 |
|
Gareth J. Greenaway
|
0fc82bdca3
|
Merge pull request #52193 from Ch3LL/bp-47005
Backport #47005 to 2018.3
|
2019-03-15 18:15:16 -07:00 |
|
Gareth J. Greenaway
|
1a54fd1141
|
Merge branch '2018.3' into bp-47005
|
2019-03-15 18:13:35 -07:00 |
|
Gareth J. Greenaway
|
0f3cd2a4b7
|
Merge pull request #52194 from Ch3LL/bp-52149
Backport #52149 to 2018.3
|
2019-03-15 18:13:18 -07:00 |
|
Gareth J. Greenaway
|
f68caa633f
|
Merge branch '2018.3' into bp-47005
|
2019-03-15 18:09:24 -07:00 |
|
Gareth J. Greenaway
|
bff3f3cf2b
|
Merge branch '2018.3' into bp-52149
|
2019-03-15 18:09:16 -07:00 |
|
Christian McHugh
|
a96bf24acb
|
Back-port PR #52212 to 2018.3
|
2019-03-15 18:03:55 -07:00 |
|