Commit Graph

102582 Commits

Author SHA1 Message Date
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
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
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
50e89ab425
Merge pull request #55215 from jtraub91/issue-55198-twilio-docs
update docstrings
2019-11-13 02:41:54 -07: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
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
d2183924e9
Merge pull request #54598 from garethgreenaway/2019_2_1_port_51299
[master] Porting #51299 to master
2019-11-12 10:20:19 -07:00
Daniel Wozniak
8376c9e6be
Merge pull request #54596 from garethgreenaway/2019_2_1_port_51343
[master] Porting #51343 to master
2019-11-12 10:16:01 -07:00
Daniel Wozniak
961d192cae
Merge branch 'master' into 2019_2_1_port_50736 2019-11-12 10:14:07 -07:00
Daniel Wozniak
d23754005b
Merge pull request #54579 from garethgreenaway/2019_2_1_port_52214
[master] Porting #52214 to master
2019-11-12 10:09:54 -07:00
Daniel Wozniak
09655f9e19
Merge pull request #54571 from garethgreenaway/2019_2_1_port_54154
[master] Porting #54154 to master
2019-11-12 10:05:43 -07:00
Daniel Wozniak
23d4ca4c4c
Merge branch 'master' into 2019_2_1_port_54154 2019-11-12 10:05:13 -07:00
Daniel Wozniak
6956dc9177
Merge pull request #55266 from SeanKnight/unkown
spelling correction
2019-11-12 09:26:52 -07:00
Sean Knight
da922235b4
spelling correction 2019-11-12 02:22:36 -08:00
Tyler Johnson
32fda7ea67
Merge branch 'master' of https://github.com/saltstack/salt into port-50197 2019-11-11 17:35:18 -07:00
Daniel Wozniak
6472827ff5
Merge pull request #54993 from mchugh19/port-52187
master-port 52187 and 52351
2019-11-11 17:03:15 -07:00
Akmod
fcd5c2b62d
Fix linter error 2019-11-11 10:28:16 -07:00
Akmod
8cef624503
Merge branch 'master' into port-52187 2019-11-11 10:15:10 -07:00
Akmod
686fc03101
Merge branch 'master' into port-50197 2019-11-11 10:15:03 -07:00
Daniel Wozniak
4ef9222291
Merge pull request #55249 from bryceml/master
we no longer need a separate git fetch
2019-11-11 10:06:24 -07:00
Bryce Larson
aea12a3a67
we no longer need a separate git fetch 2019-11-10 13:03:41 -07:00
Daniel Wozniak
ec03619304
Merge pull request #55248 from s0undt3ch/master
[master] Fix path to Mac OS requirements file
2019-11-10 10:00:57 -07:00
Pedro Algarvio
4d8503e304
Fix path to Mac OS requirements file 2019-11-10 15:46:10 +00:00
Daniel Wozniak
ca1598a991
Merge branch 'master' into 2019_2_1_port_53229 2019-11-09 17:29:48 -07:00
Daniel Wozniak
92a1ca8662
Merge pull request #54549 from garethgreenaway/2019_2_1_port_50371
[master] Porting #50371 to master
2019-11-09 17:28:23 -07:00
Daniel Wozniak
9756be6497
Merge branch 'master' into 2019_2_1_port_50306 2019-11-09 17:27:33 -07:00
Daniel Wozniak
a327f84f11
Merge pull request #54917 from Oloremo/elasticsearch-add-cluster-settings-master
Added Elasticsearch cluster settings get and put methods plus the flu…
2019-11-09 17:26:18 -07:00
Daniel Wozniak
50a918975e
Merge pull request #55242 from bryceml/master_switch_to_master_golden_images
change to master branch of golden images
2019-11-09 17:25:04 -07:00
Bryce Larson
c2edb6ffce
change to master branch of golden images 2019-11-08 11:52:46 -07:00
Daniel Wozniak
974ce2a673
Merge pull request #55220 from saltstack/master_add_branch_jenkinsfiles
add branch tests as jenkinsfile's
2019-11-08 10:23:51 -07:00
Bryce Larson
c1f93feb1f
add branch tests as jenkinsfile's 2019-11-07 13:12:42 -07:00
Proskurin Kirill
109e860e31
updated changelog 2019-11-07 19:33:12 +00:00
Proskurin Kirill
dc2221b659 version added fix 2019-11-07 19:04:16 +00:00
Proskurin Kirill
7a8dd56083 Added Elasticsearch cluster settings get and put methods plus the flush_synced method 2019-11-07 19:04:16 +00:00
Jason Traub
8ea1065f87 suggested doc changes 2019-11-07 11:30:24 -05:00
Daniel Wozniak
aac7f408e3
Merge branch 'master' into 2019_2_1_port_54154 2019-11-07 08:57:29 -07:00
Daniel Wozniak
21d8e5cd1c
Merge branch 'master' into 2019_2_1_port_53229 2019-11-07 08:56:38 -07:00
Daniel Wozniak
652e568a37
Merge branch 'master' into 2019_2_1_port_50371 2019-11-07 08:55:03 -07:00
Daniel Wozniak
ebd59fe327
Merge branch 'master' into 2019_2_1_port_50306 2019-11-07 08:54:16 -07:00
Daniel Wozniak
920529e011
Merge pull request #54536 from garethgreenaway/2019_2_1_port_52589
[master] Porting #52589 to master
2019-11-07 08:52:24 -07:00
Wayne Werner
c98b8f571d
Merge branch 'master' into 2019_2_1_port_51343 2019-11-06 18:53:07 +00:00
Wayne Werner
b9dc80b490
Merge branch 'master' into 2019_2_1_port_50523 2019-11-06 18:50:49 +00:00
Daniel Wozniak
336c7926ea
Merge pull request #54674 from garethgreenaway/2019_2_1_port_52562
[master] Porting #52562 to master
2019-11-06 11:31:35 -07:00