diff options
author | Peter Eckersley <pde@users.noreply.github.com> | 2016-02-24 02:53:58 +0300 |
---|---|---|
committer | Peter Eckersley <pde@users.noreply.github.com> | 2016-02-24 02:53:58 +0300 |
commit | ce377f1a46fc639f608673076238ea1fcfad6507 (patch) | |
tree | d9b42f218eb81f8225ca9245ee69bfcefdd99019 /.travis.yml | |
parent | 7c85d431bc2324c4a701b13f4264d867e4cc8dfa (diff) | |
parent | 0e12b1fd86027cc026134d3c4ae975d3a68b0989 (diff) |
Merge pull request #2506 from TheNavigat/acttravis
Enabling apache-conf-test in Travis
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 0e4c8c0f6..d5d18737a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,9 @@ matrix: env: TOXENV=py26 BOULDER_INTEGRATION=1 - python: "2.6" env: TOXENV=py26-oldest BOULDER_INTEGRATION=1 -# Disabled for now due to requiring sudo -> causing more boulder integration -# DNS timeouts :( -# - python: "2.7" -# env: TOXENV=apacheconftest + - python: "2.7" + env: TOXENV=apacheconftest + sudo: required - python: "2.7" env: TOXENV=py27 BOULDER_INTEGRATION=1 - python: "2.7" |