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 merge-2018.3

Browse source 
Conflicts:
  - .kitchen.yml
This commit is contained in:
rallytime 2018-04-10 10:23:02 -04:00
commit ccc5bad2df
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.kitchen.yml
View file

@ -38,7 +38,7 @@ provisioner:
- 139
max_retries: 2
remote_states:
name: git://github.com/gtmanfred/salt-jenkins.git
name: git://github.com/saltstack/salt-jenkins.git
branch: 2018.3
repo: git
testingdir: /testing