Commit Graph

102643 Commits

Author SHA1 Message Date
Daniel A. Wozniak
11d10ab09f
Fix failing pip tests
integration.states.test_pip_state.PipStateTest.test_issue_6912_wrong_owner
integration.states.test_pip_state.PipStateTest.test_pip_installed_errors
2019-11-18 17:07:14 +00:00
Daniel Wozniak
0c0d99cd7e
Merge pull request #55312 from dwoz/issue_54389
Add a timeout for netapi NetapiClientTest.test_local
2019-11-17 17:57:10 -07:00
Daniel Wozniak
f71399e9dc
Merge pull request #55294 from barbaricyawps/changes_to_intro_topic
Minor change to bullet points on index topic
2019-11-16 16:03:53 -07:00
Daniel Wozniak
871e7324fc
Merge pull request #55319 from deepak-goel/fix-git-pillar-readme-doc
[FIX] minor fix in git_pillar README
2019-11-16 15:53:35 -07:00
Daniel Wozniak
9edcfab3f3
Merge pull request #54576 from garethgreenaway/2019_2_1_port_52933
[master] Porting #52933 to master
2019-11-15 10:26:57 -07:00
Daniel Wozniak
00791c5b26
Merge pull request #54480 from xeacott/fix/file.managed_binary_file
Address file.managed with binary file
2019-11-15 09:22:35 -07:00
Deepak Goel
ba12fbdbd5
[FIX] minor fix in git_pillar README 2019-11-15 12:19:16 +05:30
Daniel Wozniak
131271200c
Merge branch 'master' into issue_54389 2019-11-14 16:23:05 -07:00
Daniel Wozniak
6033b6bbca
Merge pull request #55309 from s0undt3ch/hotfix/py3.8
Skip `test_pkg_upgrade_has_pending_upgrades` on Arch Linux
2019-11-14 16:22:32 -07:00
Daniel Wozniak
aea158b0df
Merge pull request #54656 from garethgreenaway/2019_2_1_port_51385
[master] Porting #51385 to master
2019-11-14 16:17:39 -07:00
Daniel Wozniak
d44951c31b
Merge pull request #54983 from mchugh19/port-51949
master-port 51949 and 51996
2019-11-14 16:17:20 -07:00
Daniel Wozniak
b9a52dec97
Merge pull request #54546 from garethgreenaway/2019_2_1_port_49843
[master] Porting #49843 to master
2019-11-14 16:02:23 -07:00
Daniel Wozniak
cf57c214d0
Merge pull request #55001 from aplanas/backport_52150
(Backport 52150) mdadm_raid: Optionally ignore errors on examine.
2019-11-14 15:42:35 -07:00
Daniel Wozniak
50ebc2579f
Merge pull request #55190 from max-arnold/loadable-executors
[master] Port #52773 and #51427
2019-11-14 15:36:35 -07:00
Daniel A. Wozniak
a7acd78f4b
Add a timeout for netapi NetapiClientTest.test_local 2019-11-14 22:18:08 +00:00
Daniel Wozniak
3c5a791b43
Merge pull request #54588 from garethgreenaway/2019_2_1_port_52786
[master] Porting #52786 to master
2019-11-14 14:58:26 -07:00
Daniel Wozniak
f5b4b14c78
Merge pull request #54606 from garethgreenaway/2019_2_1_port_52698
[master] Porting #52698 to master
2019-11-14 14:58:02 -07:00
Daniel Wozniak
f39e99d59a
Merge pull request #54666 from garethgreenaway/2019_2_1_port_49616
[master] Porting #49616 to master
2019-11-14 14:54:00 -07:00
Daniel Wozniak
1d84451f15
Merge pull request #54677 from garethgreenaway/2019_2_1_port_49293
[master] Porting #49293 to master
2019-11-14 14:53:35 -07:00
Daniel Wozniak
3f247413ac
Merge pull request #55276 from bryceml/master_add_new_oses
add fedora31
2019-11-14 14:48:25 -07:00
Pedro Algarvio
6467bef52c
Skip test_pkg_upgrade_has_pending_upgrades on Arch Linux
Because Arch has moved to Python 3.8 and we're not there yet.
2019-11-14 19:45:58 +00:00
Bryce Larson
a99c6cf049
add fedora31 2019-11-14 11:00:26 -07:00
Dmitry Kuzmenko
c766c520db
Merge branch 'master' into 2019_2_1_port_49843 2019-11-14 04:05:51 +03:00
Dmitry Kuzmenko
6601a230ce
Merge branch 'master' into 2019_2_1_port_49616 2019-11-14 04:01:50 +03:00
Dmitry Kuzmenko
0d15451b51
Merge branch 'master' into 2019_2_1_port_51385 2019-11-14 04:01:06 +03:00
Dmitry Kuzmenko
857415f24f
Merge branch 'master' into 2019_2_1_port_49293 2019-11-14 03:54:44 +03:00
Akmod
9c1c117442
Merge branch 'master' into loadable-executors 2019-11-13 17:34:42 -07:00
Joe Eacott
aa2829791b
Merge branch 'master' into fix/file.managed_binary_file 2019-11-13 17:29:13 -07:00
Alyssa Rock
a5ad351ffb Minor change to bullet points on index topic 2019-11-13 14:23:23 -07:00
Gareth J. Greenaway
920c7d9c8d
Merge pull request #55150 from meaksh/master-bp-53237
[master] Add 'ppc64le' as a valid RPM package architecture
2019-11-13 09:50:08 -08:00
Wayne Werner
961f72eca2
Merge branch 'master' into master-bp-53237 2019-11-13 13:22:02 +00:00
Daniel Wozniak
09ad3f69c0
Merge pull request #55277 from bryceml/master_dont_set_milestones_on_non_pr_jobs
don't set milestones on non-pr jobs
2019-11-13 03:10:39 -07:00
Daniel Wozniak
6efffbc14c
Merge branch 'master' into 2019_2_1_port_49293 2019-11-13 03:09:17 -07:00
Daniel Wozniak
1f15aad1f6
Merge pull request #54605 from garethgreenaway/2019_2_1_port_50523
[master] Porting #50523 to master
2019-11-13 03:06:07 -07:00
Daniel Wozniak
734dcbb07a
Merge pull request #54587 from garethgreenaway/2019_2_1_port_50736
[master] Porting #50736 to master
2019-11-13 03:05:22 -07:00
Daniel Wozniak
183bfa405f
Merge branch 'master' into 2019_2_1_port_52933 2019-11-13 02:55:18 -07:00
Daniel Wozniak
f34a900cc6
Merge branch 'master' into backport_52150 2019-11-13 02:42:35 -07:00
Daniel Wozniak
50e89ab425
Merge pull request #55215 from jtraub91/issue-55198-twilio-docs
update docstrings
2019-11-13 02:41:54 -07:00
Max Arnold
2b99d3437b Add saltutil.sync_executors state 2019-11-13 16:29:15 +07:00
Wayne Werner
321710e7c8 Merge pull request #52773 from bloomberg/exec_2019
2019.2: bug: executors lazyloader is missing functions and proxy args
2019-11-13 16:15:37 +07:00
Christian McHugh
53370722d9
Merge branch 'master' into port-51949 2019-11-13 06:49:56 +00:00
Bryce Larson
413498f211
don't set milestones on non-pr jobs 2019-11-12 17:07:01 -07:00
Daniel Wozniak
2ed3a1b8ff
Merge pull request #54565 from garethgreenaway/2019_2_1_port_53229
[master] Porting #53229 to master
2019-11-12 15:00:45 -07:00
Daniel Wozniak
c4004112e9
Merge pull request #54542 from garethgreenaway/2019_2_1_port_50306
[master] Porting #50306 to master
2019-11-12 14:58:53 -07:00
Daniel Wozniak
c5b0e5c3e5
Merge branch 'master' into master-bp-53237 2019-11-12 10:37:33 -07:00
Daniel Wozniak
df33a3c695
Merge branch 'master' into backport_52150 2019-11-12 10:35:46 -07:00
Daniel Wozniak
4a5aa4dbe8
Merge pull request #54984 from mchugh19/port-50197
master-port 50197 and 51900
2019-11-12 10:34:39 -07:00
Daniel Wozniak
b4bf0b2e24
Merge pull request #54687 from garethgreenaway/2019_2_1_port_52574
[master] Porting #52574 to master
2019-11-12 10:27:47 -07:00
Daniel Wozniak
f3607e9a54
Merge branch 'master' into 2019_2_1_port_49293 2019-11-12 10:25:34 -07:00
Daniel Wozniak
04b8bb11bc
Merge branch 'master' into 2019_2_1_port_52698 2019-11-12 10:21:10 -07:00