Pedro Algarvio
7d6280d62b
Merge pull request #51875 from dwoz/avoid_ssl_race
...
Avoid race condition when initializing OpenSSL
2019-02-28 07:22:40 +00:00
Pedro Algarvio
e99654d4ee
Merge branch '2017.7' into avoid_ssl_race
2019-02-28 07:22:24 +00:00
Daniel Wozniak
c0bb1f7aee
Merge pull request #51850 from waynew/cherry-pick-ping-fix
...
fix reactor ping test
2019-02-27 17:35:20 -07:00
Daniel Wozniak
ad7a9ec0ee
Merge pull request #51893 from twangboy/gate_zfs_2017.7
...
Gate zfs module on Windows
2019-02-27 17:32:56 -07:00
twangboy
e0d58eb95e
Gate zfs module on Windows
2019-02-27 14:38:33 -07:00
Daniel Wozniak
6da495fd29
Fix linter
2019-02-27 11:36:37 -07:00
Daniel A. Wozniak
f758a100cb
Avoid race condition when initializing OpenSSL
2019-02-27 09:57:29 -07:00
Daniel A. Wozniak
f78b360c0a
fix reactor ping test
2019-02-26 15:49:20 -06:00
Megan Wilhite
864d4be0c3
Merge pull request #51770 from Ch3LL/doc_conf_2017
...
Update release versions for the 2017.7 branch
2019-02-25 09:11:22 -05:00
Daniel Wozniak
3cf3099f89
Merge pull request #51774 from terminal-labs/py3-server-docs-update
...
Py3 server docs update
2019-02-24 01:35:42 -07:00
Daniel Wozniak
b4153d3833
Merge pull request #51757 from twangboy/fix_case_2017.7
...
Make recurse and directory case sensitive (2017.7)
2019-02-23 15:23:23 -07:00
Alan Cugler
1f00c89fca
Added in python 3 server according to the consensus from #51748
2019-02-22 15:22:10 -06:00
Ch3LL
25d9ca24d7
Update release versions for the 2017.7 branch
2019-02-22 14:57:22 -05:00
twangboy
6b0b5d2af1
Fix failing py3 tests
...
This should fix the following integration tests
integration.states.test_file.FileTest.test_directory_clean_require_in
integration.states.test_file.FileTest.test_directory_clean_require_in_with_id
integration.states.test_file.FileTest.test_directory_clean_require_with_name
integration.states.test_file.FileTest.test_recurse_clean
integration.states.test_file.FileTest.test_recurse_clean_specific_env
2019-02-22 11:59:57 -07:00
Daniel Wozniak
e04f735dec
Merge pull request #51502 from ogd-software/51501-states-boto3_route53.py-fails-to-validate-ALIAS-A-records
...
51501 states boto3 route53.py fails to validate alias a records
2019-02-22 01:18:35 -07:00
twangboy
feb29f3353
Make recurse and directory case sensitive
2019-02-21 18:59:09 -07:00
Alan Cugler
bfb9d87af7
added the python3 command for startign the python http server.
2019-02-21 12:20:08 -06:00
Daniel Wozniak
9c128aaa71
Merge pull request #51732 from s0undt3ch/features/nox-2017.7
...
[2017.7] Add initial nox configuration. Tell `tox`'ers to use `nox`'.
2019-02-21 10:21:48 -07:00
Pedro Algarvio
328989d6cc
Add initial nox configuration. Tell tox'ers to use nox'.
2019-02-20 17:04:32 +00:00
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
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
