saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2017.7' into '2018.3'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2018-10-22 10:15:39 -04:00
commit 87e20fd9a0
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ci/kitchen-centos7-py2
View file

@ -1,4 +1,4 @@
timeout(time: 6, unit: 'HOURS') {
timeout(time: 8, unit: 'HOURS') {
node('kitchen-slave') {
timestamps {
ansiColor('xterm') {

2
Gemfile
View file

@ -13,7 +13,7 @@ end
group :windows do
gem 'winrm', '~>2.0'
gem 'winrm-fs', :git => 'https://github.com/dwoz/winrm-fs.git', :branch => 'chunked_downloads'
gem 'winrm-fs', '~>1.3.1'
end
group :ec2 do