Skip to content

Commit

Permalink
Master master into letsencrypt-auto-release so Travis will build it.
Browse files Browse the repository at this point in the history
  • Loading branch information
erikrose committed Jan 12, 2016
2 parents 6c05197 + 355563e commit ed56264
Show file tree
Hide file tree
Showing 46 changed files with 900 additions and 152 deletions.
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,19 @@ env:
matrix:
- TOXENV=py26 BOULDER_INTEGRATION=1
- TOXENV=py27 BOULDER_INTEGRATION=1
- TOXENV=py26-oldest BOULDER_INTEGRATION=1
- TOXENV=py27-oldest BOULDER_INTEGRATION=1
- TOXENV=py33
- TOXENV=py34
- TOXENV=lint
- TOXENV=cover
# Disabled for now due to requiring sudo -> causing more boulder integration
# DNS timeouts :(
# - TOXENV=apacheconftest
matrix:
include:
- env: TOXENV=py35
python: 3.5


# Only build pushes to the master branch, PRs, and branches beginning with
Expand Down
Loading

0 comments on commit ed56264

Please sign in to comment.