From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 27 Nov 2014 16:37:25 +0000 (+0000)
Subject: Work around a Travis-CI configuration change.
X-Git-Tag: allmydata-tahoe-1.10.1a1~99
X-Git-Url: https://git.rkrishnan.org/components/%22news.html/simplejson/something?a=commitdiff_plain;h=4457b9747186ac9e4e8951ed88057019072aff31;p=tahoe-lafs%2Ftahoe-lafs.git

Work around a Travis-CI configuration change.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/.travis.yml b/.travis.yml
index e9116a0d..36356b2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ python:
   - "2.6"
 before_install:
   - sh -c set
+  - git config --global user.email "travis-tahoe@tahoe-lafs.org"
+  - git config --global user.name "Travis Tahoe"
   - git pull --depth=1000
   - python misc/build_helpers/show-tool-versions.py
 install: