rallytime
|
82e73fe49d
|
Merge branch '2018.3' into 'fluorine'
Conflicts:
- doc/ref/tops/all/index.rst
- salt/fileclient.py
- salt/grains/core.py
- salt/modules/win_file.py
- salt/pillar/__init__.py
- salt/utils/http.py
|
2018-10-18 10:41:42 -04:00 |
|
Mike Place
|
5123488dc2
|
Merge pull request #50013 from Giandom/2018.3
Passed kwargs to db_exists in db_remove method
|
2018-10-18 13:28:29 +02:00 |
|
Mike Place
|
f7f8cb533f
|
Merge pull request #50094 from rallytime/doc-errs
Fix varstack_top naming in docs
|
2018-10-18 12:49:24 +02:00 |
|
Nicole Thomas
|
aa94f6009d
|
Merge pull request #50092 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
|
2018-10-17 15:57:06 -04:00 |
|
Nicole Thomas
|
c3387a70bf
|
Merge pull request #50093 from rallytime/flaky-lxd-tests
Mark lxd_container integration tests as flaky
|
2018-10-17 15:45:36 -04:00 |
|
Nicole Thomas
|
d1f2c5d47e
|
Merge pull request #50082 from garethgreenaway/50073_fixing_typo_boto_cloudfront
[2018.3] Fixing a typo in the boto_cloudfront
|
2018-10-17 15:34:59 -04:00 |
|
Nicole Thomas
|
d0c68df885
|
Merge pull request #49878 from rallytime/merge-fluorine
[fluorine] Merge forward from 2018.3 to fluorine
|
2018-10-17 13:58:31 -04:00 |
|
rallytime
|
1fbb84d934
|
Fix varstack_top naming in docs
Warnings were generated in the doc builds about how `varstack` doesn't
exist. The file is named `varstack_top`.
|
2018-10-17 10:31:45 -04:00 |
|
rallytime
|
045bb0df1d
|
Mark lxd_container integration tests as flaky
|
2018-10-17 10:28:17 -04:00 |
|
rallytime
|
8609064f30
|
Update old utils paths to use new paths
|
2018-10-17 10:24:26 -04:00 |
|
rallytime
|
a984ad8b3d
|
Merge branch '2017.7' into '2018.3'
No conflicts.
|
2018-10-17 10:21:42 -04:00 |
|
Nicole Thomas
|
7ec3840d25
|
Merge pull request #49794 from twangboy/fix_groupadd_test
Fix possible issue with test_groupadd
|
2018-10-17 10:20:33 -04:00 |
|
Gareth J. Greenaway
|
e19f4c4958
|
Due to a previous PR the test_sdb_runner in sdb.test_vault was failing because of a exception that was being swallowed in the test run_run function. The cause was that when vault related functions were being run, if they were being run on the master then they were being forced to run through the _get_token_and_url_from_master() function, which is pull the id element out of the grains dictionary. When the call was taking place from a runner, the exception was popping up since there is no id when called from a runner. This fix checks to see if the id exists in the dictionary first, if it is there then _get_token_and_url_from_master() is called, otherwise _use_local_config is called.
|
2018-10-17 09:59:19 -04:00 |
|
Nicole Thomas
|
05bd2a0692
|
Merge pull request #50090 from garethgreenaway/fix_vault_sdb_runner_test
[2018.3] Fix to utils/vault.py
|
2018-10-17 09:57:29 -04:00 |
|
Giandom
|
9c91df3630
|
Merge branch '2018.3' into 2018.3
|
2018-10-17 10:05:48 +02:00 |
|
Gareth J. Greenaway
|
444a4e525f
|
Merge branch '2018.3' into fix_vault_sdb_runner_test
|
2018-10-16 22:10:55 -07:00 |
|
Gareth J. Greenaway
|
6ef5ce4182
|
Due to a previous PR the test_sdb_runner in sdb.test_vault was failing because of a exception that was being swallowed in the test run_run function. The cause was that when vault related functions were being run, if they were being run on the master then they were being forced to run through the _get_token_and_url_from_master() function, which is pull the id element out of the grains dictionary. When the call was taking place from a runner, the exception was popping up since there is no id when called from a runner. This fix checks to see if the id exists in the dictionary first, if it is there then _get_token_and_url_from_master() is called, otherwise _use_local_config is called.
|
2018-10-16 17:38:56 -07:00 |
|
Nicole Thomas
|
7092879263
|
Merge pull request #50080 from terminalmage/issue49275
Ensure all string kwargs passed to Tornado's httpclient are str types
|
2018-10-16 17:01:40 -04:00 |
|
Gareth J. Greenaway
|
b5b90a1608
|
Fixing a typo in the boto_cloudfront.
|
2018-10-16 11:01:35 -07:00 |
|
Erik Johnson
|
4a6c327cba
|
Ensure all string kwargs passed to Tornado's httpclient are str types
Failing to do so will result in a `TypeError` when running setopt in
pycurl, as it does not support `unicode` types on Python 2.
|
2018-10-16 10:51:56 -05:00 |
|
Mike Place
|
a152f979aa
|
Merge pull request #50077 from rallytime/flaky-random-tests
Add flaky decorator to random_org tests that occassionally fail
|
2018-10-16 17:35:57 +02:00 |
|
rallytime
|
305dc0118d
|
Add flaky decorator to random_org tests that occassionally fail
|
2018-10-16 11:14:12 -04:00 |
|
Mike Place
|
45b6da3ac4
|
Merge pull request #49811 from nhavens/optimize-firewalld-state
Optimize firewalld state
|
2018-10-16 13:26:45 +02:00 |
|
Mike Place
|
06bb2453ba
|
Merge branch '2018.3' into 2018.3
|
2018-10-16 11:34:04 +02:00 |
|
Mike Place
|
e562838f5f
|
Merge pull request #50028 from basseed/fix-windows-virtual-grain
Fix #50015, Windows grain defaults to physical as unix grain
|
2018-10-16 11:29:40 +02:00 |
|
Mike Place
|
abe894ddb1
|
Merge pull request #50030 from garethgreenaway/updating_sdb_test_vault
[fluorine] Updates to integration.sdb.test_vault
|
2018-10-16 11:27:47 +02:00 |
|
Mike Place
|
b94e0a01ac
|
Merge pull request #50055 from rallytime/bp-50024
Back-port #50024 to 2018.3
|
2018-10-16 11:14:06 +02:00 |
|
Mike Place
|
14f3fac0c4
|
Merge pull request #50056 from rallytime/bp-50029
Back-port #50029 to 2018.3
|
2018-10-16 11:12:58 +02:00 |
|
Mike Place
|
f3fe4b67f7
|
Merge pull request #50064 from rallytime/bp-50022
Back-port #50022 to 2018.3
|
2018-10-16 11:09:46 +02:00 |
|
Mike Place
|
c2a46ceda2
|
Merge pull request #50066 from garethgreenaway/49988_redact_passwords_in_source
[2018.3] Redact any passwords from source paths
|
2018-10-16 11:08:24 +02:00 |
|
Mike Place
|
ab2cb51cbc
|
Merge pull request #50068 from garethgreenaway/1140_mac_system_tests_2018_3_failing
[2018.3] Updating salt.utils.mac_utils
|
2018-10-16 11:07:09 +02:00 |
|
Mike Place
|
56577c17ba
|
Merge pull request #50069 from twangboy/fix_test_virt
Fix `unit.modules.test_virt` for Windows
|
2018-10-16 11:06:11 +02:00 |
|
twangboy
|
cea321f9af
|
Fix unit.modules.test_virt for Windows
Fix hard-coded unix-style paths
|
2018-10-15 17:16:57 -06:00 |
|
Gareth J. Greenaway
|
eedeacb65d
|
Updating another reference to salt.utils.mac_utils to use __utils__
|
2018-10-15 16:12:04 -07:00 |
|
Daniel Wallace
|
4c4bb5a489
|
Merge pull request #49987 from terminalmage/pillar_roots
Make Pillar no longer munge file_roots
|
2018-10-15 16:58:08 -05:00 |
|
Nicole Thomas
|
1e377ace15
|
Merge pull request #50065 from rallytime/bp-50044
Back-port #50044 to 2018.3
|
2018-10-15 17:32:36 -04:00 |
|
Gareth J. Greenaway
|
27ef1e0ce0
|
Redact any passwords that are in http/https based source paths.
|
2018-10-15 14:03:43 -07:00 |
|
rallytime
|
1eaaab705f
|
Doc title formatting must match doc name length
|
2018-10-15 16:55:35 -04:00 |
|
Christian McHugh
|
6ac26b6c1e
|
add saltclass docs from release notes
|
2018-10-15 16:54:20 -04:00 |
|
Brian Saville
|
40da3ce2d0
|
Make test check_pillar more lenient
|
2018-10-15 16:50:57 -04:00 |
|
Nicole Thomas
|
8a6b4357f9
|
Merge pull request #50038 from s0undt3ch/2018.3
Don't squash the traceback
|
2018-10-15 16:36:55 -04:00 |
|
Nicole Thomas
|
dbfd7eed4d
|
Merge pull request #50054 from rallytime/bp-50004
Back-port #50004 to 2018.3
|
2018-10-15 16:36:02 -04:00 |
|
Nicole Thomas
|
a9e9974bd5
|
Merge pull request #50057 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
|
2018-10-15 16:35:45 -04:00 |
|
Nicole Thomas
|
f1bcb1f275
|
Merge pull request #50060 from rallytime/fix-lint
[2018.3] Fix some pylint issues that have popped up recently
|
2018-10-15 16:35:21 -04:00 |
|
Gareth J. Greenaway
|
a8f4f3927e
|
Merge branch '2018.3' into fix-lint
|
2018-10-15 13:33:33 -07:00 |
|
Nicole Thomas
|
b26b21c017
|
Merge pull request #50052 from rallytime/bp-49943
Back-port #49943 to 2018.3
|
2018-10-15 16:06:19 -04:00 |
|
Gareth J. Greenaway
|
931ec6154a
|
Fixing test_vault for python3.
|
2018-10-15 12:07:56 -07:00 |
|
Gareth J. Greenaway
|
90adb38b5d
|
Updating the integration.sdb.test_vault setup function to attempt to recreate the container if the login test fails.
|
2018-10-15 12:07:56 -07:00 |
|
rallytime
|
e73f13d766
|
[2018.3] Fix some pylint issues that have popped up recently
|
2018-10-15 13:29:54 -04:00 |
|
rallytime
|
1b5b018da2
|
Merge branch '2017.7' into '2018.3'
Conflicts:
- salt/minion.py
- salt/states/lvm.py
|
2018-10-15 13:13:57 -04:00 |
|