Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/113' into develop, Forward port #113
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-mabe committed Oct 26, 2016
2 parents 5d59ce3 + 80a9368 commit c4c11ed
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ matrix:
- php: 5.6
env:
- DEPS=locked
- TEST_COVERAGE=true
- APCU_PECL_VERSION="apcu-4.0.10"
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
- PATH="$HOME/.local/bin:$PATH"
- php: 5.6
env:
- DEPS=latest
- TEST_COVERAGE=true
- APCU_PECL_VERSION="apcu-4.0.11"
- php: 7
env:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- [#113](https://github.com/zendframework/zend-cache/pull/113)
Travis: Moved coverage reporting to latest env
- [#114](https://github.com/zendframework/zend-cache/pull/114)
Travis: removed fast_finish flag
- [#107](https://github.com/zendframework/zend-cache/issues/107)
Expand Down

0 comments on commit c4c11ed

Please sign in to comment.