Gareth J. Greenaway
|
8c53890222
|
Merge branch '2018.3' into 51959_fix_acl_present_output
|
2019-03-22 10:22:48 -07: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
|
efb9ec0b31
|
Merge pull request #52215 from garethgreenaway/bp-52212
Back-port PR #52212 to 2018.3
|
2019-03-21 10:13:45 -07:00 |
|
Gareth J. Greenaway
|
0bdde94ea3
|
Merge branch '2018.3' into 51959_fix_acl_present_output
|
2019-03-21 10:12:36 -07: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 |
|
Gareth J. Greenaway
|
ee585600d2
|
Merge branch '2018.3' into merge-2018.3
|
2019-03-20 15:34:23 -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
|
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 |
|
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 |
|
Gareth J. Greenaway
|
85be1782bd
|
Merge pull request #52201 from max-arnold/rename-beacon-validate
Rename obsolete beacon validation function
|
2019-03-15 13:04:21 -07:00 |
|
Pedro Algarvio
|
b14dbc99b8
|
Merge branch '2017.7.9' into 2017.7
Conflicts:
* requirements/static/centos-6.txt
* requirements/static/centos-7.txt
* requirements/static/debian-8.txt
* requirements/static/debian-9.txt
* requirements/static/fedora-28.txt
* requirements/static/fedora-29.txt
* requirements/static/opensuse-42.txt
* requirements/static/opensuse-leap-15.txt
* requirements/static/ubuntu-14.04.txt
* requirements/static/ubuntu-16.04.txt
* requirements/static/ubuntu-18.04.txt
|
2019-03-15 17:05:03 +00:00 |
|
Gareth J. Greenaway
|
3cb5c82981
|
Merge pull request #52208 from s0undt3ch/2017.7.9
[2017.7.9] Lock PyYAML to < 5.1
|
2019-03-15 10:01:59 -07:00 |
|
Pedro Algarvio
|
6a789a1a89
|
Update static requirements
|
2019-03-15 16:52:27 +00:00 |
|
Pedro Algarvio
|
cee9480ee3
|
Lock PyYAML to < 5.1
The reason being that at least one unit test case will leak memory until
exhaustion.
|
2019-03-15 16:45:54 +00:00 |
|
Gareth J. Greenaway
|
e1e9a2bd0f
|
Merge branch '2018.3' into rename-beacon-validate
|
2019-03-15 09:21:29 -07:00 |
|
Megan Wilhite
|
0383ac39d0
|
Merge pull request #52189 from Ch3LL/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
|
2019-03-15 12:14:35 -04:00 |
|
Megan Wilhite
|
d1700f3afc
|
Merge branch '2018.3' into bp-47005
|
2019-03-15 12:03:50 -04:00 |
|
Pedro Algarvio
|
ff54f53640
|
The kitchen nox verifier already takes care of the sinlge -v flag.
Let's not double it.
|
2019-03-15 15:30:23 +00:00 |
|
Pedro Algarvio
|
a4f241dc17
|
The kitchen nox verifier already takes care of the sinlge -v flag.
Let's not double it.
|
2019-03-15 15:28:54 +00:00 |
|
Megan Wilhite
|
99729807e9
|
Merge branch '2018.3' into merge-2018.3
|
2019-03-15 10:31:02 -04:00 |
|
Pedro Algarvio
|
0cb641e3c5
|
Fix static requirements search bad logic
|
2019-03-15 11:38:57 +00:00 |
|
Pedro Algarvio
|
a2aa708f38
|
Fix static requirements search bad logic
|
2019-03-15 11:38:10 +00:00 |
|
Pedro Algarvio
|
45a3e4a0ca
|
distro reports Opensuse 15 as Opensuse Leap 15
|
2019-03-15 11:32:51 +00:00 |
|
Pedro Algarvio
|
621b047f68
|
distro reports Opensuse 15 as Opensuse Leap 15
|
2019-03-15 11:32:04 +00:00 |
|
Max Arnold
|
75acce19f1
|
Rename obsolete beacon validation function
|
2019-03-15 18:28:12 +07:00 |
|
Pedro Algarvio
|
de7bb24d44
|
Ubuntu 18.04 locked requirements files
|
2019-03-15 11:18:05 +00:00 |
|
Pedro Algarvio
|
bc08e3c823
|
Ubuntu 16.04 locked requirements files
|
2019-03-15 11:17:58 +00:00 |
|
Pedro Algarvio
|
0d353d2ff3
|
Ubuntu 14.04 locked requirements files
|
2019-03-15 11:17:52 +00:00 |
|
Pedro Algarvio
|
1186122223
|
Opensuse 42 locked requirements files
|
2019-03-15 11:17:43 +00:00 |
|
Pedro Algarvio
|
fa6888bb88
|
Opensuse 15 locked requirements files
|
2019-03-15 11:17:33 +00:00 |
|