From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 2 Oct 2014 15:36:17 +0000 (+0100)
Subject: Merge branch '182-osx-packaging-1' into 2249-windows-dep-workaround-4
X-Git-Url: https://git.rkrishnan.org/status?a=commitdiff_plain;h=9167a0659c1febfb26c7be85ea72aeaf0b39a0d4;p=tahoe-lafs%2Ftahoe-lafs.git

Merge branch '182-osx-packaging-1' into 2249-windows-dep-workaround-4
---

9167a0659c1febfb26c7be85ea72aeaf0b39a0d4
diff --cc .travis.yml
index db9a8686,13643680..e9116a0d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -6,8 -6,8 +6,7 @@@ before_install
    - sh -c set
    - git pull --depth=1000
    - python misc/build_helpers/show-tool-versions.py
-   - python -c "import os; print os.statvfs('.')"
  install:
 -  - pip install 'twisted>=0.13.0'
    - pip install 'coveralls==0.4.2'
  before_script: python setup.py build
  script: bin/tahoe @coverage run --branch --source=src/allmydata @tahoe --version-and-path debug trial --rterrors --reporter=timing