Daniel Wozniak
|
99ce48ddd3
|
Merge pull request #51712 from dwoz/gemstestagain
[2017.7] Fix ruby gems tests, again
|
2019-02-19 14:43:26 -07:00 |
|
Daniel A. Wozniak
|
0d3b227674
|
Fix ruby gems tests, again
|
2019-02-19 14:06:36 -07:00 |
|
Daniel Wozniak
|
18452c4e4d
|
Merge pull request #51528 from twangboy/backport_51471
Backport 51471
|
2019-02-15 12:36:38 -07:00 |
|
Daniel Wozniak
|
ee80ce3fd4
|
Merge pull request #51655 from garethgreenaway/49661_starting_salt_master_openssl
[2017.7] Removing unused salt.crypt imports
|
2019-02-15 12:35:35 -07:00 |
|
Gareth J. Greenaway
|
f647b9557c
|
Merge branch '2017.7' into 49661_starting_salt_master_openssl
|
2019-02-14 16:48:02 -08:00 |
|
Gareth J. Greenaway
|
1831e645fa
|
Removing options from libcrypto.OPENSSL_init_crypto so it will simply use the defaults.
|
2019-02-14 16:45:12 -08:00 |
|
Gareth J. Greenaway
|
8d0f8018ba
|
removing salt.crypt from payload.py which is not used and causing salt-key to break.
|
2019-02-14 11:18:46 -08:00 |
|
Daniel Wozniak
|
bcc13db2ba
|
Merge pull request #51562 from gilbrechbuhler/fix_rabbitmq_policy_change_check
Bugfix : Fix RabbitMQ policy definition change check
|
2019-02-14 10:39:47 -07:00 |
|
Gareth J. Greenaway
|
a5a54c4af0
|
Removing unused import which is causing salt-master to not start when using openssl 1.1.1-1.
|
2019-02-14 09:21:19 -08:00 |
|
Shane Lee
|
cafaa98739
|
Merge pull request #51648 from dwoz/increase_wait
[2017.7] Increase minion wait for slow boxes
|
2019-02-14 09:30:49 -07:00 |
|
Shane Lee
|
e2377a975f
|
Merge branch '2017.7' into increase_wait
|
2019-02-14 09:30:39 -07:00 |
|
Shane Lee
|
e3d28d9801
|
Merge pull request #51643 from dwoz/batch_exit
[2017.7] increase batch test timeout on windows
|
2019-02-14 09:28:36 -07:00 |
|
Daniel A. Wozniak
|
7c2d7a4390
|
Increase minion wait for slow boxes
|
2019-02-14 01:46:53 -07:00 |
|
Daniel A. Wozniak
|
42d1d02e6d
|
increase batch test timeout on windows
|
2019-02-14 01:23:23 -07:00 |
|
Daniel Wozniak
|
b5ae53a3b9
|
Merge pull request #51631 from Ch3LL/lint-2017
Fix pylint on 2017.7
|
2019-02-13 19:50:57 -07:00 |
|
Daniel Wozniak
|
c0aa4dc837
|
Fix linter by ignoring async await check.
|
2019-02-13 14:51:08 -07:00 |
|
Gareth J. Greenaway
|
396622c2b0
|
Merge branch '2017.7' into lint-2017
|
2019-02-13 11:38:35 -08:00 |
|
Daniel Wozniak
|
e69ce9d2ce
|
Merge branch '2017.7' into 51501-states-boto3_route53.py-fails-to-validate-ALIAS-A-records
|
2019-02-13 11:43:38 -07:00 |
|
Daniel Wozniak
|
ba8d0eaa9a
|
Merge pull request #51547 from s0undt3ch/2017.7
[2017.7] Allow NOT to install pip dependencies
|
2019-02-13 11:14:36 -07:00 |
|
Shane Lee
|
30ce5094ab
|
Merge pull request #51182 from lmf-mx/darwin-plist-update
Fix service name in minion plist
|
2019-02-13 09:42:40 -07:00 |
|
Pedro Algarvio
|
8e009e0972
|
Allow NOT to install pip dependencies
|
2019-02-13 12:02:09 +00:00 |
|
Daniel Wozniak
|
4297c0d380
|
Merge branch '2017.7' into darwin-plist-update
|
2019-02-13 01:55:34 -07:00 |
|
Daniel Wozniak
|
68ac07f457
|
Merge pull request #51442 from dwoz/multi_master
Handle multi_master failover when daemonized
|
2019-02-13 01:26:49 -07:00 |
|
Daniel Wozniak
|
8c79f02632
|
Merge branch '2017.7' into backport_51471
|
2019-02-12 22:56:12 -07:00 |
|
Daniel Wozniak
|
8fde3a057b
|
Merge branch '2017.7' into cloud-sync-after-install
|
2019-02-12 22:35:48 -07:00 |
|
Daniel Wozniak
|
8df083c9c7
|
Merge pull request #51608 from dwoz/wait_minions_2017.7
[2017.7] Wait for minions to be pingable before starting tests
|
2019-02-12 17:48:33 -07:00 |
|
Ch3LL
|
1da9cd9466
|
Fix pylint on 2017.7
|
2019-02-12 18:08:06 -05:00 |
|
Daniel Wozniak
|
40cb4db2b9
|
Merge branch '2017.7' into multi_master
|
2019-02-12 12:14:47 -07:00 |
|
Daniel A. Wozniak
|
c55359fe45
|
fix linter
|
2019-02-12 11:58:52 -07:00 |
|
Daniel A. Wozniak
|
4702e22345
|
Wait for minions to be pingable before starting tests
|
2019-02-12 11:57:39 -07:00 |
|
Daniel Wozniak
|
39122caed7
|
Merge pull request #51589 from dwoz/script_fix_2017.7
[2017.7] Use the code directory instead of cwd for python path
|
2019-02-11 19:57:07 -07:00 |
|
Daniel A. Wozniak
|
8697ce703e
|
Disable pylint checks, only for 2017.7
|
2019-02-11 17:28:37 -07:00 |
|
Daniel A. Wozniak
|
e5972f5a03
|
Use the code directory instead of cwd for python path
|
2019-02-11 17:15:16 -07:00 |
|
Gareth J. Greenaway
|
61889ba934
|
Merge pull request #51452 from terminalmage/bp-50963
Backport #50963 to 2017.7
|
2019-02-11 08:10:08 -08:00 |
|
Gil Brechbuhler
|
ed2b1e1383
|
Fix RabbitMQ policy definition update check
|
2019-02-08 16:20:02 +01:00 |
|
twangboy
|
20a7ee5d4b
|
Backport 51471
|
2019-02-06 13:46:48 -07:00 |
|
Daniel Wozniak
|
54d2e02fb1
|
Merge branch '2017.7' into bp-50963
|
2019-02-06 10:43:11 -07:00 |
|
Martin Paulus
|
50934068ba
|
Implement PEP8 E711 styling fix
|
2019-02-05 12:58:41 +01:00 |
|
Martin Paulus
|
7640e90347
|
Ensure boto3_route53 correctly validates existing ALIAS records
|
2019-02-05 12:44:40 +01:00 |
|
Martin Paulus
|
ff633b0b9b
|
Ensure boto3_route53 survives attempts to validate ALIAS records
|
2019-02-05 12:42:29 +01:00 |
|
Erik Johnson
|
0c989f04f1
|
Merge pull request #51437 from twangboy/fix_raise_2017.7
Fix raise 2017.7
|
2019-02-04 09:29:57 -06:00 |
|
Erik Johnson
|
d06526c7a2
|
Allow for kwargs to be used in object initialization
|
2019-02-01 09:28:47 -06:00 |
|
Erik Johnson
|
0e760b59ba
|
pip states: Use case-insensitive dictionaries for pip.list return
|
2019-02-01 09:28:47 -06:00 |
|
Erik Johnson
|
5ca9f82ab5
|
Add a CaseInsensitiveDict implementation
|
2019-02-01 09:28:47 -06:00 |
|
Erik Johnson
|
2aaa9f9c95
|
pip.installed: Fix traceback when _find_key doesn't return a match
|
2019-02-01 09:28:44 -06:00 |
|
Daniel Wozniak
|
ecd1637206
|
Merge branch '2017.7' into fix_raise_2017.7
|
2019-01-30 16:31:16 -07:00 |
|
Daniel A. Wozniak
|
2dc51714f6
|
Hanlde multi_master failover when daemonized
|
2019-01-30 15:06:28 -07:00 |
|
Daniel Wozniak
|
67b7d285ed
|
Merge pull request #51370 from dwoz/setup_py_req_fix
Handle pipenv like version restrictions
|
2019-01-30 13:03:40 -07:00 |
|
Daniel Wozniak
|
e9b3d946d0
|
Merge pull request #51367 from dwoz/cloud_config_2017
Cloud provider and profile configs are merged [2017.7]
|
2019-01-30 13:03:12 -07:00 |
|
twangboy
|
f3c9cd4166
|
Add missing raise statement
|
2019-01-30 11:20:56 -07:00 |
|