diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-06-10 19:00:41 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-06-10 19:00:41 +0200 |
| commit | afaeea148553439684e6091f282bf5a4ee5c00d6 (patch) | |
| tree | 9de4549d414a78bed64a2a20f7941695c7d6c4df /.travis.yml | |
| parent | b4278cc96fa0184b4f522e2bcfe82bd8eba93595 (diff) | |
| parent | eea0f3a6197dba565c5df349ed06c0a70b49b77f (diff) | |
Merge branch 'debian/sid' into ubuntu/master1.0.4ubuntu1
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index b413134c5..2852db483 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,5 @@ language: cpp before_install: - sudo apt-get update -q - sudo ./prepare-release travis-ci - - sudo apt-get install -q --no-install-recommends stunnel4 + - sudo apt-get install -q --no-install-recommends stunnel4 db-util script: make && make test && test/integration/run-tests |