diff options
| author | Thom May <thom@may.lt> | 2017-04-10 19:55:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-10 19:55:40 +0100 |
| commit | 429a9b9a1a8add3dfae571ccabeab00ebaf3d408 (patch) | |
| tree | 70f33e3cab2d9f5273d76ff48b8656204c99ac7a | |
| parent | c6b4ed4b4726dfc9375b5acb0a06286f2f21262e (diff) | |
| parent | 73f219012c0596dc56e5e7359e1c5436f8c4fdcd (diff) | |
| download | chef-429a9b9a1a8add3dfae571ccabeab00ebaf3d408.tar.gz | |
Merge pull request #6041 from chef/tm/en_travisify
Enable travis testing for chef-12 branch
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 85881f6f18..e25c8535bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_script: branches: only: - master - - 11-stable + - chef-12 env: global: diff --git a/appveyor.yml b/appveyor.yml index bb15c065a7..c4d7dfcffc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,6 +15,7 @@ skip_tags: true branches: only: - master + - chef-12 install: - systeminfo |